izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure the credentials dir exists before setting ACLs on it

Browse Source
This commit is contained in:
Cameron Gutman
2023-04-29 15:45:40 -05:00
parent c8d4fd9f69
commit 4730f4a3af
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -739,9 +739,6 @@ if(WIN32) # see options at: https://cmake.org/cmake/help/latest/cpack_gen/nsis.h
IfSilent +2 0 IfSilent +2 0
ExecShell 'open' 'https://sunshinestream.readthedocs.io/' ExecShell 'open' 'https://sunshinestream.readthedocs.io/'
nsExec::ExecToLog 'icacls \\\"$INSTDIR\\\" /reset /T' nsExec::ExecToLog 'icacls \\\"$INSTDIR\\\" /reset /T'
nsExec::ExecToLog 'icacls \\\"$INSTDIR\\\\config\\\\credentials\\\" /inheritance:r'
nsExec::ExecToLog 'icacls \\\"$INSTDIR\\\\config\\\\credentials\\\" \
/grant:r Administrators:\\\(OI\\\)\\\(CI\\\)\\\(F\\\)'
nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\migrate-config.bat\\\"' nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\migrate-config.bat\\\"'
nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\add-firewall-rule.bat\\\"' nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\add-firewall-rule.bat\\\"'
nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\install-service.bat\\\"' nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\install-service.bat\\\"'

7
src_assets/windows/misc/migration/migrate-config.bat
View File

@@ -31,6 +31,13 @@ if exist "%OLD_DIR%\credentials\" (
) )
) )
rem Create the credentials directory if it wasn't migrated or already existing
if not exist "%NEW_DIR%\credentials\" mkdir "%NEW_DIR%\credentials"
rem Disallow read access to the credentials directory for normal users
icacls "%NEW_DIR%\credentials" /inheritance:r
icacls "%NEW_DIR%\credentials" /grant:r Administrators:(OI)(CI)(F)
rem Migrate the covers directory rem Migrate the covers directory
if exist "%OLD_DIR%\covers\" ( if exist "%OLD_DIR%\covers\" (
if not exist "%NEW_DIR%\covers\" ( if not exist "%NEW_DIR%\covers\" (