소스 검색

Change profanity documentation on xmpp page

Bob Mottram 8 년 전
부모
커밋
dd387dffee
2개의 변경된 파일34개의 추가작업 그리고 161개의 파일을 삭제
  1. 2
    53
      doc/EN/app_xmpp.org
  2. 32
    108
      website/EN/app_xmpp.html

+ 2
- 53
doc/EN/app_xmpp.org 파일 보기

22
 
22
 
23
 A well written article on the state of XMPP and how it compares to other chat protocols [[https://gultsch.de/xmpp_2016.html][can be found here]].
23
 A well written article on the state of XMPP and how it compares to other chat protocols [[https://gultsch.de/xmpp_2016.html][can be found here]].
24
 
24
 
25
+* Using with Profanity
26
+You can install the [[./app_profanity.html][profanity app]] via *Add/remove apps* on the *Administrator control panel*. Logging in and then selecting *Run App* and *profanity* will start it.
25
 * Using with Gajim
27
 * Using with Gajim
26
 In mid 2016 [[https://gajim.org/][Gajim]] became the first desktop XMPP client to support the [[https://en.wikipedia.org/wiki/OMEMO][OMEMO end-to-end security standard]], which is superior to the more traditional [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
28
 In mid 2016 [[https://gajim.org/][Gajim]] became the first desktop XMPP client to support the [[https://en.wikipedia.org/wiki/OMEMO][OMEMO end-to-end security standard]], which is superior to the more traditional [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
27
 
29
 
52
 
54
 
53
 If you wish to use OpenPGP to encrypt your messages then go to *Edit/Accounts*, select your account and then the *Personal Information* tab. You can then choose your GPG key. When initiating a chat you can select the *Advanced* button and then select *Toggle OpenPGP Encryption*. OpenPGP is not as secure as OMEMO, but does allow you to use XMPP in a similar style to email in that the recipient of the message does not necessarily need to be online at the same time that you send it.
55
 If you wish to use OpenPGP to encrypt your messages then go to *Edit/Accounts*, select your account and then the *Personal Information* tab. You can then choose your GPG key. When initiating a chat you can select the *Advanced* button and then select *Toggle OpenPGP Encryption*. OpenPGP is not as secure as OMEMO, but does allow you to use XMPP in a similar style to email in that the recipient of the message does not necessarily need to be online at the same time that you send it.
54
 
56
 
55
-* Using with Profanity
56
-The [[https://profanity.im][Profanity]] shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
57
-
58
-#+BEGIN_SRC bash
59
-ssh username@domain -p 2222
60
-#+END_SRC
61
-
62
-Then select XMPP. Generate an [[https://en.wikipedia.org/wiki/Off-the-Record_Messaging][OTR]] key with:
63
-
64
-#+BEGIN_SRC bash
65
-/otr gen
66
-#+END_SRC
67
-
68
-Then to start a conversation using OTR:
69
-
70
-#+BEGIN_SRC bash
71
-/otr start otherusername@otheruserdomain
72
-#+END_SRC
73
-
74
-or if you're already in an insecure chat with someone just use:
75
-
76
-#+BEGIN_SRC bash
77
-/otr start
78
-#+END_SRC
79
-
80
-Set a security question and answer:
81
-
82
-#+BEGIN_SRC bash
83
-/otr question "What is the name of your best friends rabbit?" fiffi
84
-#+END_SRC
85
-
86
-On the other side the user can enter:
87
-
88
-#+BEGIN_SRC bash
89
-/otr answer fiffi
90
-#+END_SRC
91
-
92
-For the most paranoid you can also obtain your fingerprint:
93
-
94
-#+BEGIN_SRC bash
95
-/otr myfp
96
-#+END_SRC
97
-
98
-and quote that.  If they quote theirs back you can check it with:
99
-
100
-#+BEGIN_SRC bash
101
-/otr theirfp
102
-#+END_SRC
103
-
104
-If the fingerprints match then you can be pretty confident that unless you have been socially engineered via the question and answer you probably are talking to who you think you are, and that it will be difficult for mass surveillance systems to know the content of the conversation. For more details see [[https://www.profanity.im/otr.html][this guide]]
105
-
106
- When accessed via the user control panel the client is automatically routed through Tor and so if you are also using OTR then this provides protection for both message content and metadata.
107
-
108
 * Using with Jitsi
57
 * Using with Jitsi
109
 Jitsi can be downloaded from https://jitsi.org
58
 Jitsi can be downloaded from https://jitsi.org
110
 
59
 

+ 32
- 108
website/EN/app_xmpp.html 파일 보기

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2017-01-08 Sun 13:43 -->
6
+<!-- 2017-05-16 Tue 21:11 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title></title>
9
 <title></title>
71
   pre.src-fortran:before { content: 'Fortran'; }
71
   pre.src-fortran:before { content: 'Fortran'; }
72
   pre.src-gnuplot:before { content: 'gnuplot'; }
72
   pre.src-gnuplot:before { content: 'gnuplot'; }
73
   pre.src-haskell:before { content: 'Haskell'; }
73
   pre.src-haskell:before { content: 'Haskell'; }
74
+  pre.src-hledger:before { content: 'hledger'; }
74
   pre.src-java:before { content: 'Java'; }
75
   pre.src-java:before { content: 'Java'; }
75
   pre.src-js:before { content: 'Javascript'; }
76
   pre.src-js:before { content: 'Javascript'; }
76
   pre.src-latex:before { content: 'LaTeX'; }
77
   pre.src-latex:before { content: 'LaTeX'; }
188
 @licstart  The following is the entire license notice for the
189
 @licstart  The following is the entire license notice for the
189
 JavaScript code in this tag.
190
 JavaScript code in this tag.
190
 
191
 
191
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
192
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
192
 
193
 
193
 The JavaScript code in this tag is free software: you can
194
 The JavaScript code in this tag is free software: you can
194
 redistribute it and/or modify it under the terms of the GNU
195
 redistribute it and/or modify it under the terms of the GNU
259
 A well written article on the state of XMPP and how it compares to other chat protocols <a href="https://gultsch.de/xmpp_2016.html">can be found here</a>.
260
 A well written article on the state of XMPP and how it compares to other chat protocols <a href="https://gultsch.de/xmpp_2016.html">can be found here</a>.
260
 </p>
261
 </p>
261
 
262
 
262
-<div id="outline-container-orge45304b" class="outline-2">
263
-<h2 id="orge45304b">Using with Gajim</h2>
264
-<div class="outline-text-2" id="text-orge45304b">
263
+<div id="outline-container-orgf44a6c4" class="outline-2">
264
+<h2 id="orgf44a6c4">Using with Profanity</h2>
265
+<div class="outline-text-2" id="text-orgf44a6c4">
266
+<p>
267
+You can install the <a href="./app_profanity.html">profanity app</a> via <b>Add/remove apps</b> on the <b>Administrator control panel</b>. Logging in and then selecting <b>Run App</b> and <b>profanity</b> will start it.
268
+</p>
269
+</div>
270
+</div>
271
+<div id="outline-container-org5033aae" class="outline-2">
272
+<h2 id="org5033aae">Using with Gajim</h2>
273
+<div class="outline-text-2" id="text-org5033aae">
265
 <p>
274
 <p>
266
 In mid 2016 <a href="https://gajim.org/">Gajim</a> became the first desktop XMPP client to support the <a href="https://en.wikipedia.org/wiki/OMEMO">OMEMO end-to-end security standard</a>, which is superior to the more traditional <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
275
 In mid 2016 <a href="https://gajim.org/">Gajim</a> became the first desktop XMPP client to support the <a href="https://en.wikipedia.org/wiki/OMEMO">OMEMO end-to-end security standard</a>, which is superior to the more traditional <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> since it also includes multi-user chat and the ratcheting mechanism pioneered by Open Whisper Systems. To install it:
267
 </p>
276
 </p>
268
 
277
 
269
 <div class="org-src-container">
278
 <div class="org-src-container">
270
-<pre class="src src-bash">su -c <span class="org-string">'echo "deb ftp://ftp.gajim.org/debian unstable main" &gt; /etc/apt/sources.list.d/gajim.list'</span>
279
+<pre><code class="src src-bash">su -c <span class="org-string">'echo "deb ftp://ftp.gajim.org/debian unstable main" &gt; /etc/apt/sources.list.d/gajim.list'</span>
271
 sudo apt-get update
280
 sudo apt-get update
272
 sudo apt-get -y install gajim-dev-keyring
281
 sudo apt-get -y install gajim-dev-keyring
273
 sudo apt-get -y install git tor python-dev python-pip gajim-nightly
282
 sudo apt-get -y install git tor python-dev python-pip gajim-nightly
275
 <span class="org-builtin">cd</span> ~/.local/share/gajim/plugins
284
 <span class="org-builtin">cd</span> ~/.local/share/gajim/plugins
276
 git clone https://github.com/omemo/gajim-omemo
285
 git clone https://github.com/omemo/gajim-omemo
277
 sudo pip install <span class="org-variable-name">protobuf</span>==2.6.1, python-axolotl==0.1.35
286
 sudo pip install <span class="org-variable-name">protobuf</span>==2.6.1, python-axolotl==0.1.35
278
-</pre>
287
+</code></pre>
279
 </div>
288
 </div>
280
 
289
 
281
 <p>
290
 <p>
299
 </p>
308
 </p>
300
 
309
 
301
 <div class="org-src-container">
310
 <div class="org-src-container">
302
-<pre class="src src-bash">~/.local/share/gajim
303
-</pre>
311
+<pre><code class="src src-bash">~/.local/share/gajim
312
+</code></pre>
304
 </div>
313
 </div>
305
 
314
 
306
 <p>
315
 <p>
309
 </div>
318
 </div>
310
 </div>
319
 </div>
311
 
320
 
312
-<div id="outline-container-orge94392f" class="outline-2">
313
-<h2 id="orge94392f">Using with Profanity</h2>
314
-<div class="outline-text-2" id="text-orge94392f">
315
-<p>
316
-The <a href="https://profanity.im">Profanity</a> shell based user interface and is perhaps the simplest way to use XMPP from a laptop. It's also a good way to ensure that your OTR keys are the same even when logging in from different laptops or devices, and it also means that if those devices later become compomised then there are no locally stored OTR keys to be found.
317
-</p>
318
-
319
-<div class="org-src-container">
320
-<pre class="src src-bash">ssh username@domain -p 2222
321
-</pre>
322
-</div>
323
-
324
-<p>
325
-Then select XMPP. Generate an <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging">OTR</a> key with:
326
-</p>
327
-
328
-<div class="org-src-container">
329
-<pre class="src src-bash">/otr gen
330
-</pre>
331
-</div>
332
-
333
-<p>
334
-Then to start a conversation using OTR:
335
-</p>
336
-
337
-<div class="org-src-container">
338
-<pre class="src src-bash">/otr start otherusername@otheruserdomain
339
-</pre>
340
-</div>
341
-
342
-<p>
343
-or if you're already in an insecure chat with someone just use:
344
-</p>
345
-
346
-<div class="org-src-container">
347
-<pre class="src src-bash">/otr start
348
-</pre>
349
-</div>
350
-
351
-<p>
352
-Set a security question and answer:
353
-</p>
354
-
355
-<div class="org-src-container">
356
-<pre class="src src-bash">/otr question <span class="org-string">"What is the name of your best friends rabbit?"</span> fiffi
357
-</pre>
358
-</div>
359
-
360
-<p>
361
-On the other side the user can enter:
362
-</p>
363
-
364
-<div class="org-src-container">
365
-<pre class="src src-bash">/otr answer fiffi
366
-</pre>
367
-</div>
368
-
369
-<p>
370
-For the most paranoid you can also obtain your fingerprint:
371
-</p>
372
-
373
-<div class="org-src-container">
374
-<pre class="src src-bash">/otr myfp
375
-</pre>
376
-</div>
377
-
378
-<p>
379
-and quote that.  If they quote theirs back you can check it with:
380
-</p>
381
-
382
-<div class="org-src-container">
383
-<pre class="src src-bash">/otr theirfp
384
-</pre>
385
-</div>
386
-
387
-<p>
388
-If the fingerprints match then you can be pretty confident that unless you have been socially engineered via the question and answer you probably are talking to who you think you are, and that it will be difficult for mass surveillance systems to know the content of the conversation. For more details see <a href="https://www.profanity.im/otr.html">this guide</a>
389
-</p>
390
-
391
-<p>
392
-When accessed via the user control panel the client is automatically routed through Tor and so if you are also using OTR then this provides protection for both message content and metadata.
393
-</p>
394
-</div>
395
-</div>
396
-
397
-<div id="outline-container-orgeafb4a2" class="outline-2">
398
-<h2 id="orgeafb4a2">Using with Jitsi</h2>
399
-<div class="outline-text-2" id="text-orgeafb4a2">
321
+<div id="outline-container-orga1b2804" class="outline-2">
322
+<h2 id="orga1b2804">Using with Jitsi</h2>
323
+<div class="outline-text-2" id="text-orga1b2804">
400
 <p>
324
 <p>
401
 Jitsi can be downloaded from <a href="https://jitsi.org">https://jitsi.org</a>
325
 Jitsi can be downloaded from <a href="https://jitsi.org">https://jitsi.org</a>
402
 </p>
326
 </p>
423
 </div>
347
 </div>
424
 </div>
348
 </div>
425
 
349
 
426
-<div id="outline-container-orgdc856f7" class="outline-2">
427
-<h2 id="orgdc856f7">Using with Ubuntu</h2>
428
-<div class="outline-text-2" id="text-orgdc856f7">
350
+<div id="outline-container-org9e45966" class="outline-2">
351
+<h2 id="org9e45966">Using with Ubuntu</h2>
352
+<div class="outline-text-2" id="text-org9e45966">
429
 <p>
353
 <p>
430
 The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
354
 The default XMPP client in Ubuntu is Empathy.  Using Empathy isn't as secure as using Jitsi, since it doesn't include the <i>off the record</i> feature, but since it's the default it's what many users will have easy access to.
431
 </p>
355
 </p>
444
 </div>
368
 </div>
445
 </div>
369
 </div>
446
 
370
 
447
-<div id="outline-container-org9cdcce3" class="outline-2">
448
-<h2 id="org9cdcce3">Using Tor Messenger</h2>
449
-<div class="outline-text-2" id="text-org9cdcce3">
371
+<div id="outline-container-orgebb228c" class="outline-2">
372
+<h2 id="orgebb228c">Using Tor Messenger</h2>
373
+<div class="outline-text-2" id="text-orgebb228c">
450
 <p>
374
 <p>
451
 Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org">torproject.org</a> and the setup is pretty simple.
375
 Tor Messenger is a messaging client which supports XMPP, and its onion routing enables you to protect the metadata of chat interactions to some extent by making it difficult for an adversary to know which server is talking to which. You can download Tor Messenger from <a href="https://torproject.org">torproject.org</a> and the setup is pretty simple.
452
 </p>
376
 </p>
453
 </div>
377
 </div>
454
 </div>
378
 </div>
455
 
379
 
456
-<div id="outline-container-orga36a236" class="outline-2">
457
-<h2 id="orga36a236">Using with Android/Conversations</h2>
458
-<div class="outline-text-2" id="text-orga36a236">
380
+<div id="outline-container-org1a2d0c5" class="outline-2">
381
+<h2 id="org1a2d0c5">Using with Android/Conversations</h2>
382
+<div class="outline-text-2" id="text-org1a2d0c5">
459
 <p>
383
 <p>
460
 Install <a href="https://f-droid.org/">F-Droid</a>
384
 Install <a href="https://f-droid.org/">F-Droid</a>
461
 </p>
385
 </p>
477
 </p>
401
 </p>
478
 
402
 
479
 <div class="org-src-container">
403
 <div class="org-src-container">
480
-<pre class="src src-bash">Jabber ID: myusername@mydomain
404
+<pre><code class="src src-bash">Jabber ID: myusername@mydomain
481
 Password:  your XMPP password
405
 Password:  your XMPP password
482
 Hostname:  mydomain (preferably your xmpp onion address)
406
 Hostname:  mydomain (preferably your xmpp onion address)
483
 Port:      5222
407
 Port:      5222
484
-</pre>
408
+</code></pre>
485
 </div>
409
 </div>
486
 
410
 
487
 <p>
411
 <p>