Fixes the management scripts under a non-root install where the user ID is something besides 1000 (#11870)

.github/workflows/ci.yml

@@ -617,7 +617,7 @@ jobs:
           version: ${{ steps.get_version.outputs.version }}
           prerelease: ${{ steps.get_version.outputs.prerelease }}
           publish: true # ensures release is not marked as draft
-          committish: ${{ github.sha }}
+          commitish: ${{ github.sha }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload release archive

docker/management_script.sh

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py management_command "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 	python3 manage.py management_command "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py management_command "$@"
 fi

docker/rootfs/usr/local/bin/convert_mariadb_uuid

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py convert_mariadb_uuid "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py convert_mariadb_uuid "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py convert_mariadb_uuid "$@"
 fi

docker/rootfs/usr/local/bin/createsuperuser

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py createsuperuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py createsuperuser "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py createsuperuser "$@"
 fi

docker/rootfs/usr/local/bin/decrypt_documents

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py decrypt_documents "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py decrypt_documents "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py decrypt_documents "$@"
 fi

docker/rootfs/usr/local/bin/document_archiver

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_archiver "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_archiver "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_archiver "$@"
 fi

docker/rootfs/usr/local/bin/document_create_classifier

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_create_classifier "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_create_classifier "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_create_classifier "$@"
 fi

docker/rootfs/usr/local/bin/document_exporter

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_exporter "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_exporter "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_exporter "$@"
 fi

docker/rootfs/usr/local/bin/document_fuzzy_match

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_fuzzy_match "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_fuzzy_match "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_fuzzy_match "$@"
 fi

docker/rootfs/usr/local/bin/document_importer

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_importer "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_importer "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_importer "$@"
 fi

docker/rootfs/usr/local/bin/document_index

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_index "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_index "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_index "$@"
 fi

docker/rootfs/usr/local/bin/document_renamer

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_renamer "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_renamer "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_renamer "$@"
 fi

docker/rootfs/usr/local/bin/document_retagger

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_retagger "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_retagger "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_retagger "$@"
 fi

docker/rootfs/usr/local/bin/document_sanity_checker

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_sanity_checker "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_sanity_checker "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_sanity_checker "$@"
 fi

docker/rootfs/usr/local/bin/document_thumbnails

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py document_thumbnails "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py document_thumbnails "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py document_thumbnails "$@"
 fi

docker/rootfs/usr/local/bin/mail_fetcher

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py mail_fetcher "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py mail_fetcher "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py mail_fetcher "$@"
 fi

docker/rootfs/usr/local/bin/manage_superuser

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py manage_superuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py manage_superuser "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py manage_superuser "$@"
 fi

docker/rootfs/usr/local/bin/prune_audit_logs

@@ -5,10 +5,8 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ $(id -u) == 0 ]]; then
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	s6-setuidgid paperless python3 manage.py prune_audit_logs "$@"
-elif [[ $(id -un) == "paperless" ]]; then
 		python3 manage.py prune_audit_logs "$@"
-else
+elif [[ $(id -un) == "paperless" ]]; then
-	echo "Unknown user."
+	s6-setuidgid paperless python3 manage.py prune_audit_logs "$@"
 fi

pyproject.toml

@@ -238,7 +238,7 @@ lint.isort.force-single-line = true
 
 [tool.codespell]
 write-changes = true
-ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober"
+ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober,commitish"
 skip = "src-ui/src/locale/*,src-ui/pnpm-lock.yaml,src-ui/e2e/*,src/paperless_mail/tests/samples/*,src/documents/tests/samples/*,*.po,*.json"
 
 [tool.pytest.ini_options]

src/documents/data_models.py

@@ -115,7 +115,7 @@ class DocumentMetadataOverrides:
             ).values_list("id", flat=True),
         )
         overrides.custom_fields = {
-            custom_field.id: custom_field.value
+            custom_field.field.id: custom_field.value
             for custom_field in doc.custom_fields.all()
         }