Merge branch 'fix/permissions-after-unpack' of github.com:nzbgetcom/n…

…zbget into feature/test-fix-permissions

Makefile.am

@@ -365,8 +365,7 @@ webui_FILES = \
 	webui/lib/raphael.min.js \
 	webui/lib/elycharts.js \
 	webui/lib/elycharts.min.js \
-	webui/img/house-16.ico \
-	webui/img/download-16.ico \
+	webui/lib/material-icons.woff2 \
 	webui/img/icons.png \
 	webui/img/icons-2x.png \
 	webui/img/transmit.gif \

daemon/postprocess/Unpack.cpp

@@ -2,7 +2,8 @@
  *  This file is part of nzbget. See <https://nzbget.com>.
  *
  *  Copyright (C) 2013-2018 Andrey Prygunkov <[email protected]>
- *
+ *  Copyright (C) 2023-2024 Denis <[email protected]>
+ * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
@@ -14,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 
@@ -732,6 +733,10 @@ bool UnpackController::Cleanup()
 				ok = false;
 			}
 
+#ifndef WIN32
+			FileSystem::SetFilePermissionsWithUmask(dstFile.Str(), g_Options->GetUMask());
+#endif
+
 			extractedFiles.push_back(filename);
 		}
 	}

daemon/util/FileSystem.cpp

@@ -2,6 +2,7 @@
  *  This file is part of nzbget. See <https://nzbget.com>.
  *
  *  Copyright (C) 2007-2017 Andrey Prygunkov <[email protected]>
+ *  Copyright (C) 2024 Denis <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -956,6 +957,16 @@ void FileSystem::FixExecPermission(const char* filename)
 		chmod(filename, buffer.st_mode);
 	}
 }
+
+void FileSystem::SetFilePermissionsWithUmask(const char* filename, mode_t umask)
+{
+	struct stat buffer;
+	if (!stat(filename, &buffer))
+	{
+		mode_t permissions = buffer.st_mode & ~umask;
+		chmod(filename, permissions);
+	}
+}
 #endif
 
 #ifdef WIN32

daemon/util/FileSystem.h

@@ -2,6 +2,7 @@
  *  This file is part of nzbget. See <https://nzbget.com>.
  *
  *  Copyright (C) 2007-2017 Andrey Prygunkov <[email protected]>
+ *  Copyright (C) 2024 Denis <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 
@@ -61,6 +62,7 @@ class FileSystem
 #ifndef WIN32
 	static CString ExpandHomePath(const char* filename);
 	static void FixExecPermission(const char* filename);
+	static void SetFilePermissionsWithUmask(const char* filename, mode_t umask);
 #endif
 	static CString ExpandFileName(const char* filename);
 	static CString GetExeFileName(const char* argv0);

docker/entrypoint.sh

@@ -11,9 +11,22 @@ if [ -f /downloads/nzbget.lock ]; then
     rm /downloads/nzbget.lock
 fi
 
+# change userid and groupid
+PUID=${PUID:-1000}
+PGID=${PGID:-1000}
+groupmod -o -g "$PGID" users >/dev/null
+usermod -o -u "$PUID" user >/dev/null
+
 # create default config if not exist
 if [ ! -f /config/nzbget.conf ]; then
     cp /app/nzbget/share/nzbget/nzbget.conf /config/nzbget.conf
+    chown user:users /config/nzbget.conf
+fi
+
+# create scripts dir
+if [ ! -d /downloads/scripts ]; then
+    mkdir -p /downloads/scripts
+    chown user:users /downloads/scripts
 fi
 
 # parse env vars to options
@@ -25,21 +38,12 @@ if [ ! -z "${NZBGET_PASS}" ]; then
   OPTIONS="${OPTIONS}-o ControlPassword=${NZBGET_PASS} "
 fi
 
-# create scripts dir
-mkdir -p /downloads/scripts
-
-# change userid and groupid
-PUID=${PUID:-1000}
-PGID=${PGID:-1000}
-groupmod -o -g "$PGID" users >/dev/null
-usermod -o -u "$PUID" user >/dev/null
-
-chown -R user:users /config || CONFIG_CHOWN_STATUS=$?
+chown user:users /config || CONFIG_CHOWN_STATUS=$?
 if [ ! -z $CONFIG_CHOWN_STATUS ]; then
   echo "*** Could not set permissions on /config ; this container may not work as expected ***"
 fi
 
-chown -R user:users /downloads || DOWNLOADS_CHOWN_STATUS=$?
+chown user:users /downloads || DOWNLOADS_CHOWN_STATUS=$?
 if [ ! -z $DOWNLOADS_CHOWN_STATUS ]; then
   echo "*** Could not set permissions on /downloads ; this container may not work as expected ***"
 fi

tests/util/JsonTest.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget. See <https://nzbget.com>.
  *
- *  CCopyright (C) 2023 Denis <[email protected]>
+ *  Copyright (C) 2023 Denis <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by