Procházet zdrojové kódy

Check for valid user

Bob Mottram před 8 roky
rodič
revize
f663b89f16
2 změnil soubory, kde provedl 36 přidání a 16 odebrání
  1. 16
    0
      src/freedombone-app-hubzilla
  2. 20
    16
      src/freedombone-utils-selector

+ 16
- 0
src/freedombone-app-hubzilla Zobrazit soubor

@@ -53,6 +53,22 @@ hubzilla_variables=(ONION_ONLY
53 53
                     HUBZILLA_ADDONS_REPO
54 54
                     HUBZILLA_ADDONS_COMMIT)
55 55
 
56
+function remove_user_hubzilla {
57
+    remove_username="$1"
58
+}
59
+
60
+function add_user_hubzilla {
61
+    if [[ $(app_is_installed hubzilla) == "0" ]]; then
62
+        echo '0'
63
+        return
64
+    fi
65
+
66
+    new_username="$1"
67
+    new_user_password="$2"
68
+
69
+    echo '0'
70
+}
71
+
56 72
 function hubzilla_renew_cert {
57 73
     dialog --title $"Renew SSL certificate" \
58 74
            --backtitle $"Freedombone Control Panel" \

+ 20
- 16
src/freedombone-utils-selector Zobrazit soubor

@@ -467,18 +467,20 @@ function add_users_after_install {
467 467
 
468 468
     for d in /home/*/ ; do
469 469
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
470
-        if [[ "$USERNAME" != "$ADMIN_USERNAME" ]]; then
471
-            if [[ $(user_added_to_app "${USERNAME}" "${app_name}") == "0" ]]; then
472
-                valstr=$"Login for user ${USERNAME}="
473
-                if grep -q "${valstr}" /home/${ADMIN_USERNAME}/README; then
474
-                    app_password=$(cat /home/${ADMIN_USERNAME}/README | grep "${valstr}" | head -n 1 | awk -F '=' '{print $2}')
475
-                else
476
-                    app_password="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
477
-                    echo "${valstr}${app_password}" >> /home/${ADMIN_USERNAME}/README
470
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
471
+            if [[ "$USERNAME" != "$ADMIN_USERNAME" ]]; then
472
+                if [[ $(user_added_to_app "${USERNAME}" "${app_name}") == "0" ]]; then
473
+                    valstr=$"Login for user ${USERNAME}="
474
+                    if grep -q "${valstr}" /home/${ADMIN_USERNAME}/README; then
475
+                        app_password=$(cat /home/${ADMIN_USERNAME}/README | grep "${valstr}" | head -n 1 | awk -F '=' '{print $2}')
476
+                    else
477
+                        app_password="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
478
+                        echo "${valstr}${app_password}" >> /home/${ADMIN_USERNAME}/README
479
+                    fi
480
+                    add_user_${app_name} "${USERNAME}" "${app_password}"
481
+                    echo "${app_name}_${USERNAME}" >> $APP_USERS_FILE
482
+                    chown ${ADMIN_USERNAME}:${ADMIN_USERNAME} /home/${ADMIN_USERNAME}/README
478 483
                 fi
479
-                add_user_${app_name} "${USERNAME}" "${app_password}"
480
-                echo "${app_name}_${USERNAME}" >> $APP_USERS_FILE
481
-                chown ${ADMIN_USERNAME}:${ADMIN_USERNAME} /home/${ADMIN_USERNAME}/README
482 484
             fi
483 485
         fi
484 486
     done
@@ -491,12 +493,14 @@ function remove_users_for_app {
491 493
 
492 494
     for d in /home/*/ ; do
493 495
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
494
-        if [[ "$USERNAME" != "$MY_USERNAME" ]]; then
495
-            if [[ $(user_added_to_app "${USERNAME}" "${app_name}") == "1" ]]; then
496
-                if [[ $(function_exists remove_user_${app_name}) == "1" ]]; then
497
-                    remove_user_${app_name} "${USERNAME}"
496
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
497
+            if [[ "$USERNAME" != "$MY_USERNAME" ]]; then
498
+                if [[ $(user_added_to_app "${USERNAME}" "${app_name}") == "1" ]]; then
499
+                    if [[ $(function_exists remove_user_${app_name}) == "1" ]]; then
500
+                        remove_user_${app_name} "${USERNAME}"
501
+                    fi
502
+                    sed -i "/${app_name}_${USERNAME}/d" $APP_USERS_FILE
498 503
                 fi
499
-                sed -i "/${app_name}_${USERNAME}/d" $APP_USERS_FILE
500 504
             fi
501 505
         fi
502 506
     done