Browse Source

Remove tahoelafs site password

Bob Mottram 8 years ago
parent
commit
5bab5cded6
3 changed files with 13 additions and 68 deletions
  1. 1
    3
      doc/EN/app_tahoelafs.org
  2. 1
    50
      src/freedombone-app-tahoelafs
  3. 11
    15
      website/EN/app_tahoelafs.html

+ 1
- 3
doc/EN/app_tahoelafs.org View File

@@ -30,9 +30,7 @@ Using cursor keys, space bar and Enter key select *Administrator controls* and t
30 30
 Select *Add/Remove Apps* then *tahoelafs*. This system is entirely based upon use of onion addresses and so no other demaon names are needed.
31 31
 
32 32
 * Initial setup
33
-Get the login password for your Tahoe-LAFS system by going to *Passwords* on the *Administrator control panel* and selecting *tahoelafs*.
34
-
35
-Go to the *About* screen on the *Administrator control panel* and look for the onion address for *tahoelafs* within the list of domains. Enter that into a Tor compatible browser. along with your username and the tahoelafs password. You can then use the interface to upload files and obtain URLs for them. The URL contains the public key needed to decrypt the file.
33
+Go to the *About* screen on the *Administrator control panel* and look for the onion address for *tahoelafs* within the list of domains. Enter that into a Tor compatible browser. You can then use the interface to upload files and obtain URLs for them. The URL contains the public key needed to decrypt the file.
36 34
 
37 35
 * Adding more servers
38 36
 You can add more servers to the system to increase its storage capacity. In a typical Tahoe-LAFS new data storage servers are automatically discovered via an introducer node, but that creates a single centralised point of failure. The installation on Freedombone has no introducer node and so details for the servers of your friends need to be entered manually.

+ 1
- 50
src/freedombone-app-tahoelafs View File

@@ -15,7 +15,7 @@
15 15
 # License
16 16
 # =======
17 17
 #
18
-# Copyright (C) 2014-2017 Bob Mottram <bob@freedombone.net>
18
+# Copyright (C) 2016-2017 Bob Mottram <bob@freedombone.net>
19 19
 #
20 20
 # This program is free software: you can redistribute it and/or modify
21 21
 # it under the terms of the GNU Affero General Public License as published by
@@ -58,40 +58,6 @@ tahoelafs_variables=(ONION_ONLY
58 58
                      TAHOELAFS_SHARES_HAPPY
59 59
                      TAHOELAFS_SHARES_TOTAL)
60 60
 
61
-function add_user_tahoelafs {
62
-    if [[ $(app_is_installed tahoelafs) == "0" ]]; then
63
-        echo '0'
64
-        return
65
-    fi
66
-
67
-    new_username="$1"
68
-    new_user_password="$2"
69
-    ${PROJECT_NAME}-pass -u $new_username -a tahoelafs -p "$new_user_password"
70
-    if grep "${new_username}:" /etc/nginx/.htpasswd-tahoelafs; then
71
-        sed -i '/${new_username}:/d' /etc/nginx/.htpasswd-tahoelafs
72
-    fi
73
-    echo "${new_user_password}" | htpasswd -i -s /etc/nginx/.htpasswd-tahoelafs ${new_username}
74
-    echo '0'
75
-}
76
-
77
-function remove_user_tahoelafs {
78
-    remove_username="$1"
79
-    ${PROJECT_NAME}-pass -u $remove_username --rmapp tahoelafs
80
-    if grep "${remove_username}:" /etc/nginx/.htpasswd-tahoelafs; then
81
-        sed -i '/${remove_username}:/d' /etc/nginx/.htpasswd-tahoelafs
82
-    fi
83
-}
84
-
85
-function change_password_tahoelafs {
86
-    change_username="$1"
87
-    change_password="$2"
88
-    ${PROJECT_NAME}-pass -u $change_username -a tahoelafs -p "$change_password"
89
-    if grep "${change_username}:" /etc/nginx/.htpasswd-tahoelafs; then
90
-        sed -i '/tahoe-${change_username}:/d' /etc/nginx/.htpasswd-tahoelafs
91
-    fi
92
-    echo "${change_password}" | htpasswd -i -s /etc/nginx/.htpasswd-tahoelafs ${change_username}
93
-}
94
-
95 61
 function add_tahoelafs_storage_node_interactive {
96 62
     data=$(tempfile 2>/dev/null)
97 63
     trap "rm -f $data" 0 1 2 5 15
@@ -384,9 +350,6 @@ function remove_tahoelafs {
384 350
         rm -rf /home/tahoelafs
385 351
     fi
386 352
     remove_app tahoelafs
387
-    if [ -f /etc/nginx/.htpasswd-tahoelafs ]; then
388
-        shred -zu /etc/nginx/.htpasswd-tahoelafs
389
-    fi
390 353
     systemctl reload tor
391 354
 }
392 355
 
@@ -603,8 +566,6 @@ function create_tahoelafs_web {
603 566
     echo "  root /var/www/tahoelafs/htdocs;" >> $tahoelafs_nginx_site
604 567
     echo '' >> $tahoelafs_nginx_site
605 568
     echo '  location / {' >> $tahoelafs_nginx_site
606
-    echo "    # auth_basic \"${TAHOELAFS_LOGIN_TEXT}\";" >> $tahoelafs_nginx_site
607
-    echo '    # auth_basic_user_file /etc/nginx/.htpasswd-tahoelafs;' >> $tahoelafs_nginx_site
608 569
     function_check nginx_limits
609 570
     nginx_limits tahoelafs '15m'
610 571
     echo '    rewrite /(.*) /$1 break;' >> $tahoelafs_nginx_site
@@ -617,16 +578,6 @@ function create_tahoelafs_web {
617 578
     echo '  }' >> $tahoelafs_nginx_site
618 579
     echo '}' >> $tahoelafs_nginx_site
619 580
 
620
-    TAHOELAFS_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
621
-    ${PROJECT_NAME}-pass -u $MY_USERNAME -a tahoelafs -p "$TAHOELAFS_ADMIN_PASSWORD"
622
-    if [ ! -f /etc/nginx/.htpasswd-tahoelafs ]; then
623
-        touch /etc/nginx/.htpasswd-tahoelafs
624
-    fi
625
-    if grep "${MY_USERNAME}:" /etc/nginx/.htpasswd-tahoelafs; then
626
-        sed -i '/${MY_USERNAME}:/d' /etc/nginx/.htpasswd-tahoelafs
627
-    fi
628
-    echo "${TAHOELAFS_ADMIN_PASSWORD}" | htpasswd -i -s /etc/nginx/.htpasswd-tahoelafs ${MY_USERNAME}
629
-
630 581
     function_check nginx_ensite
631 582
     nginx_ensite tahoelafs
632 583
     systemctl reload nginx

+ 11
- 15
website/EN/app_tahoelafs.html View File

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2017-03-09 Thu 18:22 -->
6
+<!-- 2017-03-09 Thu 19:07 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title></title>
@@ -251,9 +251,9 @@ for the JavaScript code in this tag.
251 251
 This is a robust system for encrypted file storage on one or more server. Files are accessed via a URL which contains the public key with which it was encrypted.
252 252
 </p>
253 253
 
254
-<div id="outline-container-orga78dfe1" class="outline-2">
255
-<h2 id="orga78dfe1">Installation</h2>
256
-<div class="outline-text-2" id="text-orga78dfe1">
254
+<div id="outline-container-orgabe228a" class="outline-2">
255
+<h2 id="orgabe228a">Installation</h2>
256
+<div class="outline-text-2" id="text-orgabe228a">
257 257
 <p>
258 258
 Log into your system with:
259 259
 </p>
@@ -273,22 +273,18 @@ Select <b>Add/Remove Apps</b> then <b>tahoelafs</b>. This system is entirely bas
273 273
 </div>
274 274
 </div>
275 275
 
276
-<div id="outline-container-org180a374" class="outline-2">
277
-<h2 id="org180a374">Initial setup</h2>
278
-<div class="outline-text-2" id="text-org180a374">
276
+<div id="outline-container-org096e047" class="outline-2">
277
+<h2 id="org096e047">Initial setup</h2>
278
+<div class="outline-text-2" id="text-org096e047">
279 279
 <p>
280
-Get the login password for your Tahoe-LAFS system by going to <b>Passwords</b> on the <b>Administrator control panel</b> and selecting <b>tahoelafs</b>.
281
-</p>
282
-
283
-<p>
284
-Go to the <b>About</b> screen on the <b>Administrator control panel</b> and look for the onion address for <b>tahoelafs</b> within the list of domains. Enter that into a Tor compatible browser. along with your username and the tahoelafs password. You can then use the interface to upload files and obtain URLs for them. The URL contains the public key needed to decrypt the file.
280
+Go to the <b>About</b> screen on the <b>Administrator control panel</b> and look for the onion address for <b>tahoelafs</b> within the list of domains. Enter that into a Tor compatible browser. You can then use the interface to upload files and obtain URLs for them. The URL contains the public key needed to decrypt the file.
285 281
 </p>
286 282
 </div>
287 283
 </div>
288 284
 
289
-<div id="outline-container-org4dc315b" class="outline-2">
290
-<h2 id="org4dc315b">Adding more servers</h2>
291
-<div class="outline-text-2" id="text-org4dc315b">
285
+<div id="outline-container-org54d9732" class="outline-2">
286
+<h2 id="org54d9732">Adding more servers</h2>
287
+<div class="outline-text-2" id="text-org54d9732">
292 288
 <p>
293 289
 You can add more servers to the system to increase its storage capacity. In a typical Tahoe-LAFS new data storage servers are automatically discovered via an introducer node, but that creates a single centralised point of failure. The installation on Freedombone has no introducer node and so details for the servers of your friends need to be entered manually.
294 290
 </p>