From 9ca73d7b340b6550b5dcd7d2af0655e7887d3567 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 13 Apr 2013 09:41:27 +0200 Subject: [PATCH] init the passwords with RandomStr --- CLIENT_DATA/define3264.inc | 12 +------- CLIENT_DATA/delsub3264.ins | 4 +++ CLIENT_DATA/passwd3264.ins | 42 +++++++++++++++++++++++++ CLIENT_DATA/setup3264.ins | 63 ++++++++++++++++++++------------------ 4 files changed, 81 insertions(+), 40 deletions(-) create mode 100644 CLIENT_DATA/passwd3264.ins diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc index 998ad94..e23e585 100644 --- a/CLIENT_DATA/define3264.inc +++ b/CLIENT_DATA/define3264.inc @@ -60,8 +60,6 @@ DefVar $server_httpport_set$ Set $server_httpport_set$ = GetProductProperty("server_httpport_set", "0") DefVar $server_httpport_value_of$ Set $server_httpport_value_of$ = GetProductProperty("server_httpport_value_of", "5800") -DefVar $server_httpport_value_of_hex$ -Set $server_httpport_value_of_hex$ = DecStrToHexStr($server_httpport_value_of$) DefVar $server_ipaccesscontrol_set$ Set $server_ipaccesscontrol_set$ = GetProductProperty("server_ipaccesscontrol_set", "0") DefVar $server_ipaccesscontrol_value_of$ @@ -74,8 +72,6 @@ DefVar $server_localinputprioritytimeout_set$ Set $server_localinputprioritytimeout_set$ = GetProductProperty("server_localinputprioritytimeout_set", "0") DefVar $server_localinputprioritytimeout_value_of$ Set $server_localinputprioritytimeout_value_of$ = GetProductProperty("server_localinputprioritytimeout_value_of", "3") -DefVar $server_localinputprioritytimeout_value_of_hex$ -Set $server_localinputprioritytimeout_value_of_hex$ = DecStrToHexStr($server_localinputprioritytimeout_value_of$) DefVar $server_loglevel_set$ Set $server_loglevel_set$ = GetProductProperty("server_loglevel_set", "0") DefVar $server_loglevel_value_of$ @@ -92,8 +88,6 @@ DefVar $server_pollinginterval_set$ Set $server_pollinginterval_set$ = GetProductProperty("server_pollinginterval_set", "0") DefVar $server_pollinginterval_value_of$ Set $server_pollinginterval_value_of$ = GetProductProperty("server_pollinginterval_value_of", "1000") -DefVar $server_pollinginterval_value_of_hex$ -Set $server_pollinginterval_value_of_hex$ = DecStrToHexStr($server_pollinginterval_value_of$) DefVar $server_queryacceptontimeout_set$ Set $server_queryacceptontimeout_set$ = GetProductProperty("server_queryacceptontimeout_set", "0") DefVar $server_queryacceptontimeout_value_of$ @@ -102,8 +96,6 @@ DefVar $server_querytimeout_set$ Set $server_querytimeout_set$ = GetProductProperty("server_querytimeout_set", "0") DefVar $server_querytimeout_value_of$ Set $server_querytimeout_value_of$ = GetProductProperty("server_querytimeout_value_of", "30") -DefVar $server_querytimeout_value_of_hex$ -Set $server_querytimeout_value_of_hex$ = DecStrToHexStr($server_querytimeout_value_of$) DefVar $server_removewallpaper_set$ Set $server_removewallpaper_set$ = GetProductProperty("server_removewallpaper_set", "0") DefVar $server_removewallpaper_value_of$ @@ -112,8 +104,6 @@ DefVar $server_rfbport_set$ Set $server_rfbport_set$ = GetProductProperty("server_rfbport_set", "0") DefVar $server_rfbport_value_of$ Set $server_rfbport_value_of$ = GetProductProperty("server_rfbport_value_of", "5900") -DefVar $server_rfbport_value_of_hex$ -Set $server_rfbport_value_of_hex$ = DecStrToHexStr($server_rfbport_value_of$) DefVar $server_runcontrolinterface_set$ Set $server_runcontrolinterface_set$ = GetProductProperty("server_runcontrolinterface_set", "0") DefVar $server_runcontrolinterface_value_of$ @@ -145,4 +135,4 @@ Set $server_password_value_of$ = GetProductProperty("server_password_value_o DefVar $server_viewonlypassword_set$ Set $server_viewonlypassword_set$ = GetProductProperty("server_viewonlypassword_set", "0") DefVar $server_viewonlypassword_value_of$ -Set $server_viewonlypassword_value_of$ = GetProductProperty("server_viewonlypassword_value_of", "") +Set $server_viewonlypassword_value_of$ = GetProductProperty("server_viewonlypassword_value_of", "") \ No newline at end of file diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index c0fdcce..2ff1607 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -68,9 +68,11 @@ comment "Delete program shortcuts" LinkFolder_uninstall [Winbatch_uninstall_msi_old_32] +%ProgramFiles32Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress [Winbatch_uninstall_msi_32] +%ProgramFiles32Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress [Files_uninstall_32] @@ -79,9 +81,11 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress delete -sf "$InstallDir32$\" [Winbatch_uninstall_msi_old_64] +%ProgramFiles64Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress [Winbatch_uninstall_msi_64] +%ProgramFiles64Dir%\DemoForge\Mirage Driver\uninst\unins000.exe" /silent msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress [Files_uninstall_64] diff --git a/CLIENT_DATA/passwd3264.ins b/CLIENT_DATA/passwd3264.ins new file mode 100644 index 0000000..73834d0 --- /dev/null +++ b/CLIENT_DATA/passwd3264.ins @@ -0,0 +1,42 @@ +if ( $server_password_value_of$ = "" ) + $server_password_value_of$ = RandomStr + opsiservicecall_server_password_value_of +endif + +if ( $server_controlpassword_value_of$ = "" ) + $server_controlpassword_value_of$ = RandomStr + opsiservicecall_server_controlpassword_value_of +endif + +if ( $server_viewonlypassword_value_of$ = "" ) + $server_viewonlypassword_value_of$ = RandomStr + opsiservicecall_server_viewonlypassword_value_of +endif + +[opsiservicecall_server_password_value_of] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"server_password_value_of", +"$server_password_value_of$", +"%opsiserviceUser%" +] + +[opsiservicecall_server_controlpassword_value_of] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"server_controlpassword_value_of", +"$server_controlpassword_value_of$", +"%opsiserviceUser%" +] + +[opsiservicecall_server_viewonlypassword_value_of] +"method": "setProductProperty" +"params": [ +"$ProductId$", +"server_viewonlypassword_value_of", +"$server_viewonlypassword_value_of$", +"%opsiserviceUser%" +] + diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 4125477..66d93b8 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -67,6 +67,11 @@ else Sub "%ScriptPath%\delsub3264.ins" endif + if FileExists("%ScriptPath%\passwd3264.ins") + comment "Start set passwords section" + Sub "%ScriptPath%\passwd3264.ins" + endif + comment "installing" if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") @@ -130,35 +135,35 @@ openkey [HKEY_LOCAL_MACHINE\Software\TightVNC\Server] ; set "name1" = "some string value" ; set "name2" = REG_DWORD:0001 ; set "name3" = REG_BINARY:00 af 99 cd -set "ExtraPorts"="$server_extraports_value_of$" -set "QueryTimeout"=REG_DWORD:$server_querytimeout_value_of_hex$ -set "QueryAcceptOnTimeout"=REG_DWORD:$server_queryacceptontimeout_value_of$ -set "LocalInputPriorityTimeout"=REG_DWORD:$server_localinputprioritytimeout_value_of_hex$ -set "LocalInputPriority"=REG_DWORD:$server_localinputpriority_value_of$ -set "BlockRemoteInput"=REG_DWORD:$server_blockremoteinput_value_of$ -set "BlockLocalInput"=REG_DWORD:$server_blocklocalinput_value_of$ -set "IpAccessControl"="$server_ipaccesscontrol_value_of$" -set "RfbPort"=REG_DWORD:$server_rfbport_value_of_hex$ -set "HttpPort"=REG_DWORD:$server_httpport_value_of_hex$ -set "DisconnectAction"=REG_DWORD:$server_disconnectaction_value_of$ -set "AcceptRfbConnections"=REG_DWORD:$server_acceptrfbconnections_value_of$ -set "UseVncAuthentication"=REG_DWORD:$server_usevncauthentication_value_of$ -set "UseControlAuthentication"=REG_DWORD:$server_usecontrolauthentication_value_of$ -set "LoopbackOnly"=REG_DWORD:$server_loopbackonly_value_of$ -set "AcceptHttpConnections"=REG_DWORD:$server_accepthttpconnections_value_of$ -set "LogLevel"=REG_DWORD:$server_loglevel_value_of$ -set "EnableFileTransfers"=REG_DWORD:$server_enablefiletransfers_value_of$ -set "RemoveWallpaper"=REG_DWORD:$server_removewallpaper_value_of$ -set "UseMirrorDriver"=REG_DWORD:$server_usemirrordriver_value_of$ -set "EnableUrlParams"=REG_DWORD:$server_enableurlparams_value_of$ -set "AlwaysShared"=REG_DWORD:$server_alwaysshared_value_of$ -set "NeverShared"=REG_DWORD:$server_nevershared_value_of$ -set "DisconnectClients"=REG_DWORD:$server_disconnectclients_value_of$ -set "PollingInterval"=REG_DWORD:$server_pollinginterval_value_of_hex$ -set "AllowLoopback"=REG_DWORD:$server_allowloopback_value_of$ -set "GrabTransparentWindows"=REG_DWORD:$server_grabtransparentwindows_value_of$ -set "SaveLogToAllUsersPath"=REG_DWORD:$server_savelogtoalluserspath_value_of$ -set "RunControlInterface"=REG_DWORD:$server_runcontrolinterface_value_of$ +set "ExtraPorts" = REG_SZ:"$server_extraports_value_of$" +set "QueryTimeout" = REG_DWORD:$server_querytimeout_value_of$ +set "QueryAcceptOnTimeout" = REG_DWORD:$server_queryacceptontimeout_value_of$ +set "LocalInputPriorityTimeout" = REG_DWORD:$server_localinputprioritytimeout_value_of$ +set "LocalInputPriority" = REG_DWORD:$server_localinputpriority_value_of$ +set "BlockRemoteInput" = REG_DWORD:$server_blockremoteinput_value_of$ +set "BlockLocalInput" = REG_DWORD:$server_blocklocalinput_value_of$ +set "IpAccessControl" = REG_SZ:"$server_ipaccesscontrol_value_of$" +set "RfbPort" = REG_DWORD:$server_rfbport_value_of$ +set "HttpPort" = REG_DWORD:$server_httpport_value_of$ +set "DisconnectAction" = REG_DWORD:$server_disconnectaction_value_of$ +set "AcceptRfbConnections" = REG_DWORD:$server_acceptrfbconnections_value_of$ +set "UseVncAuthentication" = REG_DWORD:$server_usevncauthentication_value_of$ +set "UseControlAuthentication" = REG_DWORD:$server_usecontrolauthentication_value_of$ +set "LoopbackOnly" = REG_DWORD:$server_loopbackonly_value_of$ +set "AcceptHttpConnections" = REG_DWORD:$server_accepthttpconnections_value_of$ +set "LogLevel" = REG_DWORD:$server_loglevel_value_of$ +set "EnableFileTransfers" = REG_DWORD:$server_enablefiletransfers_value_of$ +set "RemoveWallpaper" = REG_DWORD:$server_removewallpaper_value_of$ +set "UseMirrorDriver" = REG_DWORD:$server_usemirrordriver_value_of$ +set "EnableUrlParams" = REG_DWORD:$server_enableurlparams_value_of$ +set "AlwaysShared" = REG_DWORD:$server_alwaysshared_value_of$ +set "NeverShared" = REG_DWORD:$server_nevershared_value_of$ +set "DisconnectClients" = REG_DWORD:$server_disconnectclients_value_of$ +set "PollingInterval" = REG_DWORD:$server_pollinginterval_value_of$ +set "AllowLoopback" = REG_DWORD:$server_allowloopback_value_of$ +set "GrabTransparentWindows" = REG_DWORD:$server_grabtransparentwindows_value_of$ +set "SaveLogToAllUsersPath" = REG_DWORD:$server_savelogtoalluserspath_value_of$ +set "RunControlInterface" = REG_DWORD:$server_runcontrolinterface_value_of$