diff --git a/malboxes/installconfig/windows7/Autounattend.xml b/malboxes/installconfig/windows7/Autounattend.xml index 45472f7..b45eede 100644 --- a/malboxes/installconfig/windows7/Autounattend.xml +++ b/malboxes/installconfig/windows7/Autounattend.xml @@ -72,7 +72,7 @@ {% if proxy %} - + 0 true {{ proxy }} @@ -130,9 +130,17 @@ cmd.exe /c wmic useraccount where "name='{{ username }}'" set PasswordExpires=FALSE Disable password expiration for user {{ username }} true - + + {% if proxy %} + + 4 + cmd.exe /c powershell -File "A:\refresh-proxy.ps1" + Refresh Proxy Settings + true + + {% endif %} - 4 + 5 cmd.exe /c powershell -File "A:\enablewinrm.ps1" Enable WinRM for Packer/Vagrant communicator true diff --git a/malboxes/installconfig/windows7_64/Autounattend.xml b/malboxes/installconfig/windows7_64/Autounattend.xml index f028102..fab3a8c 100644 --- a/malboxes/installconfig/windows7_64/Autounattend.xml +++ b/malboxes/installconfig/windows7_64/Autounattend.xml @@ -72,7 +72,7 @@ {% if proxy %} - + 0 true {{ proxy }} @@ -131,8 +131,16 @@ Disable password expiration for user {{ username }} true + {% if proxy %} + + 4 + cmd.exe /c powershell -File "A:\refresh-proxy.ps1" + Refresh Proxy Settings + true + + {% endif %} - 4 + 5 cmd.exe /c powershell -File "A:\enablewinrm.ps1" Enable WinRM for Packer/Vagrant communicator true diff --git a/malboxes/scripts/windows/refresh-proxy.ps1 b/malboxes/scripts/windows/refresh-proxy.ps1 new file mode 100644 index 0000000..14bbddf --- /dev/null +++ b/malboxes/scripts/windows/refresh-proxy.ps1 @@ -0,0 +1,55 @@ +# Windows... +# +# Here is a note to someone wondering what we're doing _here_ +# (And why we're doing it here and now) +# +# Windows7 supports proxy configuration through Autounattend.xml +# Unattended install sets everything needed to have a system-wide proxy +# configuration. +# +# The problem seems to be that it fails to notify wininet subsystems of the +# configuration. Which can prevent us from accessing the Internet. +# (sometimes or always, it depends, I don't really know) +# +# This piece of code can't be run through WinRM for some reason. Running it +# through WinRM will result in Windows removing `ProxyEnable` and `ProxyServer` +# keys from the registry <--- O_o +# +# Anyway, in order to MakeItWork(tm) we need to run this interactively. +# +# These dark spells of black witchcraftery should be enough to allow +# Windows/IE/Wininet/Whatever to get the right memo and use the configured +# proxy +# + +echo "Proxy is: $([Net.GlobalProxySelection]::Select.Address.Host)" + +$signature = @' +[DllImport("wininet.dll", SetLastError = true, CharSet=CharSet.Auto)] +public static extern bool InternetSetOption(IntPtr hInternet, int dwOption, IntPtr lpBuffer, int dwBufferLength); +'@ +$wininet = Add-Type -MemberDefinition $signature -Name wininet -Namespace pinvoke -PassThru + +function Refresh-System +{ + $INTERNET_OPTION_SETTINGS_CHANGED = 39 + $INTERNET_OPTION_REFRESH = 37 + $INTERNET_OPTION_PROXY_SETTINGS_CHANGED = 95 + $a = $wininet::InternetSetOption(0, $INTERNET_OPTION_SETTINGS_CHANGED, 0, 0) + $b = $wininet::InternetSetOption(0, $INTERNET_OPTION_PROXY_SETTINGS_CHANGED, 0, 0) + $c = $wininet::InternetSetOption(0, $INTERNET_OPTION_REFRESH, 0, 0) +} + +function Test-Connection +{ + $ie = New-Object -comobject InternetExplorer.Application; + $ie.visible=$False; + $ie.navigate('http://google.com'); + start-sleep -s 5; + $ie.quit(); +} + +Refresh-System +Test-Connection + +echo "Proxy is: $([Net.GlobalProxySelection]::Select.Address.Host)" diff --git a/malboxes/templates/snippets/provision_powershell.json b/malboxes/templates/snippets/provision_powershell.json index c528f5e..f1ac41e 100644 --- a/malboxes/templates/snippets/provision_powershell.json +++ b/malboxes/templates/snippets/provision_powershell.json @@ -15,10 +15,6 @@ { "type": "windows-shell", "inline": [ - {% if proxy %} - {# Sometimes, choco decide to ignore the proxy... #} - "choco config set proxy {{ proxy }}", - {% endif %} "choco install npcap --package-parameters '/winpcap_mode=yes' -y", "choco install {{ choco_packages }} -y" ] diff --git a/malboxes/templates/snippets/provision_powershell_win7.json b/malboxes/templates/snippets/provision_powershell_win7.json index 16d242a..82a27da 100644 --- a/malboxes/templates/snippets/provision_powershell_win7.json +++ b/malboxes/templates/snippets/provision_powershell_win7.json @@ -34,10 +34,6 @@ { "type": "windows-shell", "inline": [ - {% if proxy %} - {# Sometimes, choco decide to ignore the proxy... #} - "choco config set proxy {{ proxy }}", - {% endif %} "choco install npcap --package-parameters '/winpcap_mode=yes' -y", "choco install {{ choco_packages }} -y" ] diff --git a/malboxes/templates/win7_32_analyst.json b/malboxes/templates/win7_32_analyst.json index dd96af2..b5b2d79 100644 --- a/malboxes/templates/win7_32_analyst.json +++ b/malboxes/templates/win7_32_analyst.json @@ -18,6 +18,7 @@ "floppy_files": [ "{{ cache_dir }}/Autounattend.xml", + {% if proxy %}"{{ dir }}/scripts/windows/refresh-proxy.ps1",{% endif %} "{{ dir }}/installconfig/windows7/enablewinrm.ps1" ] }], diff --git a/malboxes/templates/win7_64_analyst.json b/malboxes/templates/win7_64_analyst.json index be0094e..97dd8e1 100644 --- a/malboxes/templates/win7_64_analyst.json +++ b/malboxes/templates/win7_64_analyst.json @@ -18,6 +18,7 @@ "floppy_files": [ "{{ cache_dir }}/Autounattend.xml", + {% if proxy %}"{{ dir }}/scripts/windows/refresh-proxy.ps1",{% endif %} "{{ dir }}/installconfig/windows7_64/enablewinrm.ps1" ] }],