From 10684469fd6ca8846430f98ad5940721f007fb0e Mon Sep 17 00:00:00 2001
From: Camille Moncelier <camille@moncelier.fr>
Date: Mon, 4 Sep 2017 22:12:53 +0200
Subject: [PATCH 1/2] Add support for configuring windows proxy

Signed-off-by: Camille Moncelier <camille@moncelier.fr>
---
 malboxes/config-example.js                           | 2 ++
 malboxes/installconfig/windows10/Autounattend.xml    | 7 +++++++
 malboxes/installconfig/windows10_64/Autounattend.xml | 7 +++++++
 malboxes/installconfig/windows7/Autounattend.xml     | 7 +++++++
 malboxes/installconfig/windows7_64/Autounattend.xml  | 7 +++++++
 5 files changed, 30 insertions(+)

diff --git a/malboxes/config-example.js b/malboxes/config-example.js
index c3f403e..e8bf19a 100644
--- a/malboxes/config-example.js
+++ b/malboxes/config-example.js
@@ -45,6 +45,8 @@
 	"vsphere_password": "",
 	"vsphere_insecure": "true",
 
+	//"proxy": "company_proxy:3128",
+
 	// Windows Defender: true means enabled, false means disabled. Default is false.
 	//"windows_defender": "false",
 	// Windows Updates: true means enabled, false means disabled. Default is false.
diff --git a/malboxes/installconfig/windows10/Autounattend.xml b/malboxes/installconfig/windows10/Autounattend.xml
index f6ada28..43a49d6 100644
--- a/malboxes/installconfig/windows10/Autounattend.xml
+++ b/malboxes/installconfig/windows10/Autounattend.xml
@@ -62,6 +62,13 @@
         </component>
     </settings>
     <settings pass="oobeSystem">
+        {% if proxy %}
+        <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
+            <POLICYProxySettingsPerUser>0</POLICYProxySettingsPerUser>
+            <HKLMProxyEnable>true</HKLMProxyEnable>
+            <HKLMProxyServer>{{ proxy }}</HKLMProxyServer>
+        </component>
+        {% endif %}
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <AutoLogon>
                 <Password>
diff --git a/malboxes/installconfig/windows10_64/Autounattend.xml b/malboxes/installconfig/windows10_64/Autounattend.xml
index b4186da..cde53f3 100644
--- a/malboxes/installconfig/windows10_64/Autounattend.xml
+++ b/malboxes/installconfig/windows10_64/Autounattend.xml
@@ -62,6 +62,13 @@
         </component>
     </settings>
     <settings pass="oobeSystem">
+        {% if proxy %}
+        <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
+            <POLICYProxySettingsPerUser>0</POLICYProxySettingsPerUser>
+            <HKLMProxyEnable>true</HKLMProxyEnable>
+            <HKLMProxyServer>{{ proxy }}</HKLMProxyServer>
+        </component>
+        {% endif %}
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <AutoLogon>
                 <Password>
diff --git a/malboxes/installconfig/windows7/Autounattend.xml b/malboxes/installconfig/windows7/Autounattend.xml
index a528bb5..9ad143c 100644
--- a/malboxes/installconfig/windows7/Autounattend.xml
+++ b/malboxes/installconfig/windows7/Autounattend.xml
@@ -71,6 +71,13 @@
         </component>
     </settings>
     <settings pass="oobeSystem">
+        {% if proxy %}
+        <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
+            <POLICYProxySettingsPerUser>0</POLICYProxySettingsPerUser>
+            <HKLMProxyEnable>true</HKLMProxyEnable>
+            <HKLMProxyServer>{{ proxy }}</HKLMProxyServer>
+        </component>
+        {% endif %}
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <AutoLogon>
                 <Password>
diff --git a/malboxes/installconfig/windows7_64/Autounattend.xml b/malboxes/installconfig/windows7_64/Autounattend.xml
index e36688d..71a3c41 100644
--- a/malboxes/installconfig/windows7_64/Autounattend.xml
+++ b/malboxes/installconfig/windows7_64/Autounattend.xml
@@ -71,6 +71,13 @@
         </component>
     </settings>
     <settings pass="oobeSystem">
+        {% if proxy %}
+        <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
+            <POLICYProxySettingsPerUser>0</POLICYProxySettingsPerUser>
+            <HKLMProxyEnable>true</HKLMProxyEnable>
+            <HKLMProxyServer>{{ proxy }}</HKLMProxyServer>
+        </component>
+        {% endif %}
         <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <AutoLogon>
                 <Password>

From de5363c910f5760d96cc09909c24c4390dd1b442 Mon Sep 17 00:00:00 2001
From: Camille Moncelier <camille@moncelier.fr>
Date: Mon, 4 Sep 2017 22:15:30 +0200
Subject: [PATCH 2/2] Add support for configuring windows input locale

Signed-off-by: Camille Moncelier <camille@moncelier.fr>
---
 malboxes/config-example.js                           | 1 +
 malboxes/installconfig/windows10/Autounattend.xml    | 2 +-
 malboxes/installconfig/windows10_64/Autounattend.xml | 2 +-
 malboxes/installconfig/windows7/Autounattend.xml     | 2 +-
 malboxes/installconfig/windows7_64/Autounattend.xml  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/malboxes/config-example.js b/malboxes/config-example.js
index e8bf19a..74cdf42 100644
--- a/malboxes/config-example.js
+++ b/malboxes/config-example.js
@@ -29,6 +29,7 @@
 	// For more information on profiles check an example profile:
 	// https://github.com/GoSecure/malboxes/blob/master/malboxes/profile-example.js
 	//"profile": "maldoc",
+	//"input_locale": "fr-FR",
 
 	// Provision settings
 	// Which Hypervisor for privisoning and deployment? (Options are: "virtualbox" and "vsphere") Default is "virtualbox"
diff --git a/malboxes/installconfig/windows10/Autounattend.xml b/malboxes/installconfig/windows10/Autounattend.xml
index 43a49d6..6b86fff 100644
--- a/malboxes/installconfig/windows10/Autounattend.xml
+++ b/malboxes/installconfig/windows10/Autounattend.xml
@@ -49,7 +49,7 @@
                 <UILanguage>en-US</UILanguage>
                 <WillShowUI>Never</WillShowUI>
             </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
+            <InputLocale>{{ input_locale or 'en-US' }}</InputLocale>
             <SystemLocale>en-US</SystemLocale>
             <UILanguage>en-US</UILanguage>
             <UILanguageFallback>en-US</UILanguageFallback>
diff --git a/malboxes/installconfig/windows10_64/Autounattend.xml b/malboxes/installconfig/windows10_64/Autounattend.xml
index cde53f3..6b211fe 100644
--- a/malboxes/installconfig/windows10_64/Autounattend.xml
+++ b/malboxes/installconfig/windows10_64/Autounattend.xml
@@ -49,7 +49,7 @@
                 <UILanguage>en-US</UILanguage>
                 <WillShowUI>Never</WillShowUI>
             </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
+            <InputLocale>{{ input_locale or 'en-US' }}</InputLocale>
             <SystemLocale>en-US</SystemLocale>
             <UILanguage>en-US</UILanguage>
             <UILanguageFallback>en-US</UILanguageFallback>
diff --git a/malboxes/installconfig/windows7/Autounattend.xml b/malboxes/installconfig/windows7/Autounattend.xml
index 9ad143c..45472f7 100644
--- a/malboxes/installconfig/windows7/Autounattend.xml
+++ b/malboxes/installconfig/windows7/Autounattend.xml
@@ -58,7 +58,7 @@
                 <WillShowUI>Never</WillShowUI>
                 <UILanguage>en-US</UILanguage>
             </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
+            <InputLocale>{{ input_locale or 'en-US' }}</InputLocale>
             <SystemLocale>en-US</SystemLocale>
             <UILanguage>en-US</UILanguage>
             <UILanguageFallback>en-US</UILanguageFallback>
diff --git a/malboxes/installconfig/windows7_64/Autounattend.xml b/malboxes/installconfig/windows7_64/Autounattend.xml
index 71a3c41..f028102 100644
--- a/malboxes/installconfig/windows7_64/Autounattend.xml
+++ b/malboxes/installconfig/windows7_64/Autounattend.xml
@@ -58,7 +58,7 @@
                 <WillShowUI>Never</WillShowUI>
                 <UILanguage>en-US</UILanguage>
             </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
+            <InputLocale>{{ input_locale or 'en-US' }}</InputLocale>
             <SystemLocale>en-US</SystemLocale>
             <UILanguage>en-US</UILanguage>
             <UILanguageFallback>en-US</UILanguageFallback>