Fix: fix user checks in management scripts (#11928)

diff --git a/docker/management_script.sh b/docker/management_script.sh
index 91a6336d08c1e9741a5d2356b9bfe4d6752b5381..6d5e845493a6c59f9116b4d31dfd19c52b641638 100755 (executable)
--- a/docker/management_script.sh
+++ b/docker/management_script.sh
@@ -7,6 +7,11 @@ cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
        python3 manage.py management_command "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py management_command "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py management_command "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/convert_mariadb_uuid b/docker/rootfs/usr/local/bin/convert_mariadb_uuid
index 019c558f1e2bd05f496e1c4bc9c3c21ebb40633c..7adb0a1af1fb7cf54d7672b839ea39700534636c 100755 (executable)
--- a/docker/rootfs/usr/local/bin/convert_mariadb_uuid
+++ b/docker/rootfs/usr/local/bin/convert_mariadb_uuid
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py convert_mariadb_uuid "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py convert_mariadb_uuid "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py convert_mariadb_uuid "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py convert_mariadb_uuid "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/createsuperuser b/docker/rootfs/usr/local/bin/createsuperuser
index 2b56869f6dab38a57488f8c8cbe97765ac9ae272..b91cee3c5186e6f765d49c72d2b2bf9bce93d91b 100755 (executable)
--- a/docker/rootfs/usr/local/bin/createsuperuser
+++ b/docker/rootfs/usr/local/bin/createsuperuser
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py createsuperuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py createsuperuser "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py createsuperuser "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py createsuperuser "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/decrypt_documents b/docker/rootfs/usr/local/bin/decrypt_documents
index 27f0a21fe4b73b3e8742123c78f516d775c8a299..65d035b70b792b0b3be578784cb6794634c9f762 100755 (executable)
--- a/docker/rootfs/usr/local/bin/decrypt_documents
+++ b/docker/rootfs/usr/local/bin/decrypt_documents
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py decrypt_documents "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py decrypt_documents "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py decrypt_documents "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py decrypt_documents "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_archiver b/docker/rootfs/usr/local/bin/document_archiver
index 8d7771d26ecdf48d52818bd2be3882c7d5581d3b..4200aa7aa45f41404ba19607b1a16d6e29b7654b 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_archiver
+++ b/docker/rootfs/usr/local/bin/document_archiver
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_archiver "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_archiver "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_archiver "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_archiver "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_create_classifier b/docker/rootfs/usr/local/bin/document_create_classifier
index 23acc67413f5d9a29c990ab6b64464c20e6cdf3a..518551a4bcbfe1f0a17c39a3e8307d57cc9f8277 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_create_classifier
+++ b/docker/rootfs/usr/local/bin/document_create_classifier
@@ -6,7 +6,16 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_create_classifier "$@"
+       python3 manage.py document_create_classifier "$@"
+elif [[ $(id -u) == 0 ]]; then
+       s6-setuidgid paperless python3 manage.py document_create_classifier "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_create_classifier "$@"
+else
+       echo "Unknown user."
+       exit 1
+fi
+er "$@"
 elif [[ $(id -un) == "paperless" ]]; then
        s6-setuidgid paperless python3 manage.py document_create_classifier "$@"
 fi

diff --git a/docker/rootfs/usr/local/bin/document_exporter b/docker/rootfs/usr/local/bin/document_exporter
index d55f01d4888a9524cf22895fd4953353fe7f5eb3..a82d70a16c1c7c1037363e482053e00daa9c9228 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_exporter
+++ b/docker/rootfs/usr/local/bin/document_exporter
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_exporter "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_exporter "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_exporter "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_exporter "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_fuzzy_match b/docker/rootfs/usr/local/bin/document_fuzzy_match
index c6e4edadca4f1cf284b6914fedf7d10a8695d16c..b97c2a9ba2531c2ddeff88a7f8f1efc3ed34192e 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_fuzzy_match
+++ b/docker/rootfs/usr/local/bin/document_fuzzy_match
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_fuzzy_match "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_fuzzy_match "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_fuzzy_match "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_fuzzy_match "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_importer b/docker/rootfs/usr/local/bin/document_importer
index 07c92bb04a49f3d1da04bd274363d61529bc787d..dbfb40a57e640c652f04dcbcf22374352dabc5ed 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_importer
+++ b/docker/rootfs/usr/local/bin/document_importer
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_importer "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_importer "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_importer "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_importer "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_index b/docker/rootfs/usr/local/bin/document_index
index 47c893c10222f6bc8dae95b70e852dbb133e7769..b05f765da951e5d8bdfdd12698342978fcd43699 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_index
+++ b/docker/rootfs/usr/local/bin/document_index
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_index "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_index "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_index "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_index "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_renamer b/docker/rootfs/usr/local/bin/document_renamer
index 3406182eeb7ab16bbc56407d8d707d697848359b..720edc0d854a6799cb3c4637b00b25d01169eb6b 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_renamer
+++ b/docker/rootfs/usr/local/bin/document_renamer
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_renamer "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_renamer "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_renamer "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_renamer "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_retagger b/docker/rootfs/usr/local/bin/document_retagger
index b0d1047ffbdfba701fad26d0aa0134fb11d5f2ff..6cbe03c1988746ec2cb21977c0d7e865c457f634 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_retagger
+++ b/docker/rootfs/usr/local/bin/document_retagger
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_retagger "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_retagger "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_retagger "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_retagger "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_sanity_checker b/docker/rootfs/usr/local/bin/document_sanity_checker
index d792124fc84452b9748cb5cbbc7627a1082df153..8fff13a521f788ef1c61a02b097c972f510a829e 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_sanity_checker
+++ b/docker/rootfs/usr/local/bin/document_sanity_checker
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_sanity_checker "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_sanity_checker "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_sanity_checker "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_sanity_checker "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/document_thumbnails b/docker/rootfs/usr/local/bin/document_thumbnails
index 71d80e00de2053d107a0eb1c48a10e9c25af7990..3c0f0de4c2fb0fb1affaaa89883c6d52ddead68e 100755 (executable)
--- a/docker/rootfs/usr/local/bin/document_thumbnails
+++ b/docker/rootfs/usr/local/bin/document_thumbnails
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py document_thumbnails "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_thumbnails "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py document_thumbnails "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py document_thumbnails "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/mail_fetcher b/docker/rootfs/usr/local/bin/mail_fetcher
index 654c07389d87659ed96d5df26476dc442c9dcb14..762b850b9a8c47e2eea32aca40eb685aac7a0898 100755 (executable)
--- a/docker/rootfs/usr/local/bin/mail_fetcher
+++ b/docker/rootfs/usr/local/bin/mail_fetcher
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py mail_fetcher "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py mail_fetcher "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py mail_fetcher "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py mail_fetcher "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/manage_superuser b/docker/rootfs/usr/local/bin/manage_superuser
index a6e41168cf88657eb9c8a55d171a3baa6d72ff10..8f550cd1aa2b243bdcc7863448a8c0d075911b7e 100755 (executable)
--- a/docker/rootfs/usr/local/bin/manage_superuser
+++ b/docker/rootfs/usr/local/bin/manage_superuser
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py manage_superuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py manage_superuser "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py manage_superuser "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py manage_superuser "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi

diff --git a/docker/rootfs/usr/local/bin/prune_audit_logs b/docker/rootfs/usr/local/bin/prune_audit_logs
index 04446df1726872523a3c7587cf267b68bcdb0649..8a3ab32993356ef90ea091458c4f07c9227dcdc1 100755 (executable)
--- a/docker/rootfs/usr/local/bin/prune_audit_logs
+++ b/docker/rootfs/usr/local/bin/prune_audit_logs
@@ -6,7 +6,12 @@ set -e
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-               python3 manage.py prune_audit_logs "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py prune_audit_logs "$@"
+elif [[ $(id -u) == 0 ]]; then
        s6-setuidgid paperless python3 manage.py prune_audit_logs "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+       python3 manage.py prune_audit_logs "$@"
+else
+       echo "Unknown user."
+       exit 1
 fi