From 2e900f59511f5ea573f503e83c894bb1c82742c0 Mon Sep 17 00:00:00 2001
From: ZeArioch <16936254+ZeArioch@users.noreply.github.com>
Date: Mon, 28 Sep 2020 15:48:29 +0200
Subject: [PATCH 1/4] delete old RDP GPO files
---
Vagrant/resources/GPO/rdp_users/manifest.xml | 1 -
.../Backup.xml | 20 ------------------
.../microsoft/windows nt/SecEdit/GptTmpl.inf | Bin 384 -> 0 bytes
.../bkupInfo.xml | 1 -
.../gpreport.xml | Bin 18348 -> 0 bytes
5 files changed, 22 deletions(-)
delete mode 100644 Vagrant/resources/GPO/rdp_users/manifest.xml
delete mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/Backup.xml
delete mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf
delete mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/bkupInfo.xml
delete mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/gpreport.xml
diff --git a/Vagrant/resources/GPO/rdp_users/manifest.xml b/Vagrant/resources/GPO/rdp_users/manifest.xml
deleted file mode 100644
index fd766e0..0000000
--- a/Vagrant/resources/GPO/rdp_users/manifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/Backup.xml b/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/Backup.xml
deleted file mode 100644
index ab953e5..0000000
--- a/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/Backup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
- 01 00 04 9c 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 04 00 ec 00 08 00 00 00 05 02 28 00 00 01 00 00 01 00 00 00 8f fd ac ed b3 ff d1 11 b4 1d 00 a0 c9 68 f9 39 01 01 00 00 00 00 00 05 0b 00 00 00 00 00 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 11 ba 8e 91 83 90 50 4c a7 e8 f6 a4 e8 03 00 00 00 02 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 11 ba 8e 91 83 90 50 4c a7 e8 f6 a4 00 02 00 00 00 02 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 11 ba 8e 91 83 90 50 4c a7 e8 f6 a4 07 02 00 00 00 02 14 00 94 00 02 00 01 01 00 00 00 00 00 05 09 00 00 00 00 02 14 00 94 00 02 00 01 01 00 00 00 00 00 05 0b 00 00 00 00 02 14 00 ff 00 0f 00 01 01 00 00 00 00 00 05 12 00 00 00 00 0a 14 00 ff 00 0f 00 01 01 00 00 00 00 00 03 00 00 00 00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf b/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf
deleted file mode 100644
index ef38d8a0c2fdacc3333de6534f69f3a457d3b6ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 384
zcma)$y9&ZU5JgWd_zxmhf{?^lEK-PtT8N-%BO<;{p%Gu;O1X3Th?8E_3(JxwFs5
zgb@c~mL#lLGbKyr=Plwc=WNb|vHFu#EaKqiQ?-?vbKxp?O+=moEjn~{H)+$C&RfPn
z{!PR?Bf@vtZLx_Gj^yZRYR|%L+iCvjwiOvt5>uk8Qzo#kDm7DmatRwHMV9_Qbv7o)
qHxbyzfQl->(>704vp@KH38l*NLiG(dTbG}nlnLcF?B6Np*`Ho+5;i{o
diff --git a/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/bkupInfo.xml b/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/bkupInfo.xml
deleted file mode 100644
index 88e7503..0000000
--- a/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/bkupInfo.xml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/gpreport.xml b/Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/gpreport.xml
deleted file mode 100644
index 58ca288641ebf1235457423758e6bdc8122f3e3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 18348
zcmeHPZEqS!5T4JK`X5j~wNf1ee#g`i0XMZ28_U>DTjdKjcH+hu7jRxw^{=;mo|$g%
z_Sl1i5O9(c;yB;!?!3?J&d&OuzpL_C-bq((q#$qPQu;EGYw5|Y{2<>*NghcNzXiOx
zl?y!Y;O(uv)VKFClq*?5t4*|dEPL{`d?i(RD#y}99~<`;BUW%fKwpme3cZGMhi9w!
zyw%SmT-N}r2ly}Xv<#?4jJqno$e}!w7GS>u4qa(0Hp!8%=Q8q&(l!8gZKd`y0V^H*
zE_z-7_a3P1fhR-ILT+_I!Bc&H4~mcRnyLDXG@OB078o1lR
z-4>+U&^ARpsmYJ%zbPB?7pPs$L~lbm+E$J&iq5wRtrLU%2r}$Jx^4Ut^Eg(KgeKEe
zl_QMN1xNS5jT;^HEo2`buOMgOw^?ODPVnwnVMaY^aZVd(p*M1`np0PdIXZP{02o7P
z&^`V(%*MBkMy;dQCGZ^L+L2Rm!!V|WmQ=1qNP7jc-Nai;wu0-HUP}rqZG;HMA#kN%
zF+I-;r3CmDeAg99`WO+M6Qv~k_}fawHf(tlP$n#2j9!^G
z%Qj_jgYsU-ZyDUNwp)15FZ+;NwEU9xE5Z|2K;ap_73gsdHvcVP)?^o+;y|w_xKhvB
z;MEm=w{cy;_e#z&7Dp=KDIuL>eBRUR6w$tj9`ru!v7>NzF;)%Gz5^7(Ae1^_*TLgD
z=zI=)I>z-F&rb2IiDwNwtK(S%-=_B2{iqyqxH#CT6?e9jx4Zf>+FN}t2tj(|%OD;3)R
zk-Wf4s*QC_A6L%4h_A!S$Cz&-ZAre1Rt}4xB|Ini9QBA%X-%clQeWxw{o!a)+Dc%&
zK1EvN(^W+TqEF&lb%2kp@&|az89rAT)Yau_T6}$y1=DQQEsvg2%Q*mtnZ>YG!2l~@
zW(>NJKwD)%{_i2ea%D+*P|n%$b}j$@?6%IKkY5-#6T9*)e5jto=r`
zIKR6HJz(5B0{04t184aC3BLUV5C!mnz{17feril7XM8MW;BA!
z70@4ZB}}i-1P;Gr|!?>e#e$uR`9IEvBUUs&k>SO}dsBkK!{mum+i4K(dU;`=IU~@n8>D
z&zxIFEkAp&5M)x74acg7%OT(o
zYiTpSMMZ=7Du|hKlSX*uLi`Lz=j#`RWqQnFmZYUo>oAW($^jP*!#b8nALeu=E^x=h2^U-?(;4p{)J-CX!H%o
z&O8D(V|6*{>##fmCbPw(k?iwdxy>sA+HUx#6aScx;C!!-To`lKoaHgM+0i`&*7cDV
zw^|+544b*+F)@#ci;9W)nlPG+X3P4Sjb>k~r1|z`jUJV
zH+~hzXq}}3g|V9F?YK*NjcnOV^m-W8wEphEcr2sLoy}7Gy(c2Ue2t
ztQ{-HHZ)dGZs%Zz#%*Dw0chjQFg&8)!XJzIRL2iiC&sf?$#=<~@07#Lxmw+}t^IzI2H$RF6zo$uLTRz1egGKbC*5Qou8|5t9yALb>mUW(nXHa=UlOMC#@fBr8r=u&b3-i?i
zf6n~`HP8pBVLru`XJS~>$f^-ahjq`~t9*^Wda&y0GB8HZ>VLAIMsiMH4iy)kg-d!8
zCtvrwOgYbMrIO{`l%v;pyJ%ertyi+1q4F_zS}|F|v>da2YUXs_gMCN6?5M|xpYc!n
zIF8}??Dq_hKI-w=E
Date: Mon, 28 Sep 2020 15:50:53 +0200
Subject: [PATCH 2/4] add GPO file with 'Domain Users' as RDP group members
---
Vagrant/resources/GPO/rdp_users/manifest.xml | 1 +
.../Backup.xml | 20 ++++++++++++++++++
.../microsoft/windows nt/SecEdit/GptTmpl.inf | Bin 0 -> 380 bytes
.../bkupInfo.xml | 1 +
.../gpreport.xml | Bin 0 -> 17634 bytes
5 files changed, 22 insertions(+)
create mode 100644 Vagrant/resources/GPO/rdp_users/manifest.xml
create mode 100644 Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/Backup.xml
create mode 100644 Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf
create mode 100644 Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/bkupInfo.xml
create mode 100644 Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/gpreport.xml
diff --git a/Vagrant/resources/GPO/rdp_users/manifest.xml b/Vagrant/resources/GPO/rdp_users/manifest.xml
new file mode 100644
index 0000000..c8f230f
--- /dev/null
+++ b/Vagrant/resources/GPO/rdp_users/manifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/Backup.xml b/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/Backup.xml
new file mode 100644
index 0000000..93964de
--- /dev/null
+++ b/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/Backup.xml
@@ -0,0 +1,20 @@
+
+ 01 00 04 9c 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 04 00 ec 00 08 00 00 00 05 02 28 00 00 01 00 00 01 00 00 00 8f fd ac ed b3 ff d1 11 b4 1d 00 a0 c9 68 f9 39 01 01 00 00 00 00 00 05 0b 00 00 00 00 00 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 ee 96 fb b4 65 f1 fa 2b 36 e3 31 df e8 03 00 00 00 02 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 ee 96 fb b4 65 f1 fa 2b 36 e3 31 df 00 02 00 00 00 02 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 ee 96 fb b4 65 f1 fa 2b 36 e3 31 df 07 02 00 00 00 02 14 00 94 00 02 00 01 01 00 00 00 00 00 05 09 00 00 00 00 02 14 00 94 00 02 00 01 01 00 00 00 00 00 05 0b 00 00 00 00 02 14 00 ff 00 0f 00 01 01 00 00 00 00 00 05 12 00 00 00 00 0a 14 00 ff 00 0f 00 01 01 00 00 00 00 00 03 00 00 00 00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf b/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf
new file mode 100644
index 0000000000000000000000000000000000000000..667c750b250b013443fb1c7201dd477724a2431b
GIT binary patch
literal 380
zcma)&PY=OB6vTgLiSHndlcY(hY8`qI2OLB~xQK}VdeDj@@#QgHmEa_s-F@@s&CF&W
z_bFpyB32}<*)XF>;ingJ6O$Td%0%@^D3T)1=QFeuT5#qfc0-6onKoT|I$LxY2wTQu
zDE=zN+asi!dv~Nwp{$2_gV2wNH(PurztDo<#x^{GqP$|*GN|Ep4?
uDeAtY9PD9Jl{d$)#uC6*Tou
diff --git a/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/gpreport.xml b/Vagrant/resources/GPO/rdp_users/{02BF61B9-4ECA-4D86-B20B-323CF53B1E9F}/gpreport.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd2bc5a7125ab5f446232b8c1ebeac82b061707b
GIT binary patch
literal 17634
zcmeHOZBrsg5bn>Z%738pDOVK~#W#?6#eun4b&4gJOH%g*@#V}38W-bPsr>aM&ok}R
z>@2geC_&F`Q7p^s%=CNrbkFQRf7j%-e3rgkNJ0LP6S0%Ujz>2~o;%;Q)&2~DP{CVQBp
z4~}kuix+0rTgW~>UqKGRZ?(#T9N^i$f$2ul;;c5%LNDaTXimdm%-N|!5nv3VK{xoX
zn2qo2W^G{93Gf`^dMq7qLoud>@>|50vR{T4bYQVdu;hN%71i_X
zP|AQsKS3zzb2vB$hLY^_ubBDi16M%bs`-%4Uk$|3*&HO=b`RXX2314YO%wkkwDA8G
zTIlDTuBiOl=+%U;n}=qr_laXjn{I*LHe|Vk@2Zh0@5w!L9mD!6hs%BTcCSOtBD_*S9Cby)njfLNDJXvmJa9^gtX>w;6K_}##@
zi0`Q!0UBpoLMw4P0uAEq4*jC}?!)070S8*x
zI;^d0ti1&LJ3))ZoHTSz9H8$|yQF23k`nB-g5Jvy#GHQMp`4mE=8QJhS0{aV3+vbc
z=)8VHFK(j{ql%3z)W&(l6-JTS`w|;Ll=Gy;=etsA*F^K8^F6F>54g0j_Mr9e$p>Um
zUF0vVuuoR`x>&oPn|pF93|;M{13PCW-~!g|*I)c6A((CkTRWhqW^PP>
z(E<*?Vdft0S=;fw2WQVRYI?Y=DiOZc;IuB46?%B=Bpl9-k0hNTiXw1g0RB=AAs%EO
z9m0cJHm&4qkhs>5DXVLvb)mUczFH}Fv70(rhg5rzEu-}|sJlU|*uotvWJCE5v6^|;
z1-|t1{NIOEw0?Gne~cmV$_}Z>4kv^wXUIlX&BJ~d9Eju-u-6)0oHF+;2~lnPA#p4j
z!$N+A){=y1Z7mKn+)I1v`f*f>T#$lBFP(&A(|
zQpGcs=|)b%AbXU0*)h)UsN@mL&(*`RC>ia-y;RemE@CaC>hkzKB;8HWbx64W=VHRV
zV_zs=og0
zY`Knl*6f*8p1~z+(4+n=8Pi@~2DgNr+~*m`(sMZOn72(9x0}Z;!vPy{M>SZzLY|f7
zSsC}&veYd@*hdUU}rMR9<k@L~CFF6-_fq{5@;HAlKF{BrE~;(jaqzk9!R7gz
z)y;ed&g~z%UABA&Zkl&PU5r4mgROJ;(
zEBQRL3!kXa_gM1%wwI9E*$k7XM%)>c0?uQ(_Y~LMpS=8i^s_
zuj5IabL{b)Vbt?DN9*qlkH^yaHjQNdc_DkwD*Ucm4d+*R`b~GYnmFOZ(@u4B@}2EG
z9mlgt{&}~oW32wva3+LjWUox*;y#+gSu1QmncX#ep1BE}Y`ul=*6}=;p7oyG&%zAN
z+r~^0Xrn!ZXY_mcb8#2Y@`I-j<7@Qfv*gInhQr(`)Dzp5(>@;*=WU$bq&!^j_}QeY
z{EjutY~KausmA!b%b|A&!n={gg>M=9I+vU;?QChy&{D8%c~d>4i?
z;>koxhbO)$u}}DS39FuN-Kq2}-phU($yt5bHMsB%xTGgh>ALI7sIiTI&&5&8D$cz1
zBy?WFud}-l^>tzfsR;>0mFl>dA6;eW&*!96Rc3NAYqz<=b$+r%R_OJo~8MXTS95
vSc4Tt0X?tD
Date: Mon, 28 Sep 2020 15:52:39 +0200
Subject: [PATCH 3/4] add migration table for the domain groups to be updated
on import
---
.../resources/GPO/rdp_users/rdp_users.migtable | Bin 0 -> 2150 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Vagrant/resources/GPO/rdp_users/rdp_users.migtable
diff --git a/Vagrant/resources/GPO/rdp_users/rdp_users.migtable b/Vagrant/resources/GPO/rdp_users/rdp_users.migtable
new file mode 100644
index 0000000000000000000000000000000000000000..b18a27863d2bec328c584bee7402d2a7f9b783bc
GIT binary patch
literal 2150
zcmchZOHTqp5QOV&;(yq1=b6A+E5PwrGB=JGsm?#c0afr1FE9<%3YDZrN3
z3mgxsp{NgL0J>>hNA~xEoOKmXP}g)Gbl14j)d#F>qdlU^2&bmhVjc!maPQ`4R9t0d
z=rR{>zN#mlk=u*J!3nXye9e5j@8N^(Kof+KQ{G#O#L>DI4!?woA?z)(hf9iza3wjm
zr?xI$TO)sl_BQ%Ts<>*Jj>pq2ducV>-rlfxHtH;8&
literal 0
HcmV?d00001
From c80063c4b39776f1bc36e7bd91d0028e50c9c6ab Mon Sep 17 00:00:00 2001
From: ZeArioch <16936254+ZeArioch@users.noreply.github.com>
Date: Mon, 28 Sep 2020 15:55:41 +0200
Subject: [PATCH 4/4] add migration table target to RDP GPO import script
---
Vagrant/scripts/configure-rdp-user-gpo.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Vagrant/scripts/configure-rdp-user-gpo.ps1 b/Vagrant/scripts/configure-rdp-user-gpo.ps1
index 1fbea02..a51a203 100644
--- a/Vagrant/scripts/configure-rdp-user-gpo.ps1
+++ b/Vagrant/scripts/configure-rdp-user-gpo.ps1
@@ -1,6 +1,6 @@
# Purpose: Install the GPO that allows windomain\vagrant to RDP
Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Importing the GPO to allow windomain/vagrant to RDP..."
-Import-GPO -BackupGpoName 'Allow Domain Users RDP' -Path "c:\vagrant\resources\GPO\rdp_users" -TargetName 'Allow Domain Users RDP' -CreateIfNeeded
+Import-GPO -BackupGpoName 'Allow Domain Users RDP' -Path "c:\vagrant\resources\GPO\rdp_users" -MigrationTable "c:\vagrant\resources\GPO\rdp_users\rdp_users.migtable" -TargetName 'Allow Domain Users RDP' -CreateIfNeeded
$OU = "ou=Workstations,dc=windomain,dc=local"
$gPLinks = $null