SHOW:
|
|
- or go back to the newest paste.
1 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>git pull | |
2 | remote: Enumerating objects: 212, done. | |
3 | remote: Counting objects: 100% (212/212), done. | |
4 | remote: Compressing objects: 100% (31/31), done. | |
5 | remote: Total 581 (delta 187), reused 191 (delta 181), pack-reused 369 | |
6 | Receiving objects: 100% (581/581), 441.52 KiB | 6.13 MiB/s, done. | |
7 | Resolving deltas: 100% (367/367), completed with 64 local objects. | |
8 | From https://github.com/clong/DetectionLab | |
9 | 1ab3e4c..b98cd34 master -> origin/master | |
10 | * [new branch] apt-fast -> origin/apt-fast | |
11 | * [new branch] atomic_red_team -> origin/atomic_red_team | |
12 | * [new branch] bootstrap_update -> origin/bootstrap_update | |
13 | * [new branch] caldera2 -> origin/caldera2 | |
14 | * [new branch] configure_ou -> origin/configure_ou | |
15 | * [new branch] deprecate_vmware_fusion -> origin/deprecate_vmware_fusion | |
16 | * [new branch] fix_caldera_terraform -> origin/fix_caldera_terraform | |
17 | * [new branch] fix_issues_apr -> origin/fix_issues_apr | |
18 | * [new branch] fix_wef_inputs -> origin/fix_wef_inputs | |
19 | * [new branch] ja3 -> origin/ja3 | |
20 | * [new branch] march_update_1 -> origin/march_update_1 | |
21 | * [new branch] remove_method_folder -> origin/remove_method_folder | |
22 | * [new branch] remove_tf_datasources -> origin/remove_tf_datasources | |
23 | * [new branch] shutup_10 -> origin/shutup_10 | |
24 | * [new branch] terraform_docs -> origin/terraform_docs | |
25 | * [new branch] terraform_prebuilt_amis -> origin/terraform_prebuilt_amis | |
26 | * [new branch] tf_refresh -> origin/tf_refresh | |
27 | * [new branch] update_win10_march -> origin/update_win10_march | |
28 | * [new branch] vagrant_cloud -> origin/vagrant_cloud | |
29 | * [new branch] vagrantfile_prebuilt -> origin/vagrantfile_prebuilt | |
30 | error: Your local changes to the following files would be overwritten by merge: | |
31 | Vagrant/Vagrantfile | |
32 | Please commit your changes or stash them before you merge. | |
33 | Aborting | |
34 | Updating 1ab3e4c..b98cd34 | |
35 | ||
36 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>dir Vagrant | |
37 | Volume in drive C is Windows | |
38 | Volume Serial Number is DA96-749D | |
39 | ||
40 | Directory of C:\Users\root\git\detectionlab\DetectionLab\Vagrant | |
41 | ||
42 | 01/28/2019 11:54 AM <DIR> . | |
43 | 01/28/2019 11:54 AM <DIR> .. | |
44 | 01/27/2019 12:48 PM <DIR> .vagrant | |
45 | 01/27/2019 12:16 PM 16,404 bootstrap.sh | |
46 | 01/27/2019 12:16 PM <DIR> resources | |
47 | 01/27/2019 12:16 PM <DIR> scripts | |
48 | 01/29/2019 12:20 PM 11,854 Vagrantfile | |
49 | 01/28/2019 11:54 AM 10,866 Vagrantfile.orig | |
50 | 01/27/2019 01:40 PM 696,392 vagrant_up_dc.log | |
51 | 01/27/2019 01:19 PM 3,605,114 vagrant_up_logger.log | |
52 | 01/27/2019 02:38 PM 728,194 vagrant_up_wef.log | |
53 | 01/27/2019 02:59 PM 14,362 vagrant_up_win10.log | |
54 | 7 File(s) 5,083,186 bytes | |
55 | 5 Dir(s) 404,314,861,568 bytes free | |
56 | ||
57 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>move Vagrant\Vagrantfile c:\Users\root\ | |
58 | 1 file(s) moved. | |
59 | ||
60 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>rename Vagrant\Vagrantfile.orig Vagrantfile | |
61 | ||
62 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>dir Vagrant | |
63 | Volume in drive C is Windows | |
64 | Volume Serial Number is DA96-749D | |
65 | ||
66 | Directory of C:\Users\root\git\detectionlab\DetectionLab\Vagrant | |
67 | ||
68 | 05/17/2019 08:15 AM <DIR> . | |
69 | 05/17/2019 08:15 AM <DIR> .. | |
70 | 01/27/2019 12:48 PM <DIR> .vagrant | |
71 | 01/27/2019 12:16 PM 16,404 bootstrap.sh | |
72 | 01/27/2019 12:16 PM <DIR> resources | |
73 | 01/27/2019 12:16 PM <DIR> scripts | |
74 | 01/28/2019 11:54 AM 10,866 Vagrantfile | |
75 | 01/27/2019 01:40 PM 696,392 vagrant_up_dc.log | |
76 | 01/27/2019 01:19 PM 3,605,114 vagrant_up_logger.log | |
77 | 01/27/2019 02:38 PM 728,194 vagrant_up_wef.log | |
78 | 01/27/2019 02:59 PM 14,362 vagrant_up_win10.log | |
79 | 6 File(s) 5,071,332 bytes | |
80 | 5 Dir(s) 404,314,857,472 bytes free | |
81 | ||
82 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>git pull | |
83 | Updating 1ab3e4c..b98cd34 | |
84 | Fast-forward | |
85 | .github/issue_template.md | 16 ++ | |
86 | .gitignore | 10 + | |
87 | Packer/floppy/PinTo10.exe | Bin | |
88 | Packer/floppy/WindowsPowershell.lnk | Bin | |
89 | Packer/scripts/MakeWindows10GreatAgain.ps1 | 0 | |
90 | Packer/scripts/MakeWindows10GreatAgain.reg | 0 | |
91 | Packer/scripts/compact.bat | 33 ++- | |
92 | Packer/scripts/rearm-windows.ps1 | 0 | |
93 | Packer/scripts/sysprep.bat | 0 | |
94 | Packer/scripts/vm-guest-tools.bat | 48 ++--- | |
95 | README.md | 88 ++++---- | |
96 | Terraform/Method1/terraform.tfvars | 17 -- | |
97 | Terraform/Method1/vm_import/logger.json | 9 - | |
98 | Terraform/Pre-Built_AMIs.md | 25 +++ | |
99 | Terraform/README.md | 32 +++ | |
100 | Terraform/Terraform.md | 21 -- | |
101 | Terraform/{Method1/Method1.md => VM_to_AMIs.md} | 24 +-- | |
102 | Terraform/{Method1 => }/main.tf | 102 +++++----- | |
103 | Terraform/outputs.tf | 31 +++ | |
104 | Terraform/terraform.tfvars.example | 7 + | |
105 | Terraform/variables.tf | 84 ++++++++ | |
106 | Terraform/{Method1 => }/vm_import/dc.json | 0 | |
107 | Terraform/{Method1 => }/vm_import/role-policy.json | 0 | |
108 | .../{Method1 => }/vm_import/trust-policy.json | 0 | |
109 | Terraform/{Method1 => }/vm_import/wef.json | 0 | |
110 | Terraform/{Method1 => }/vm_import/win10.json | 0 | |
111 | Vagrant/Vagrantfile | 63 ++---- | |
112 | Vagrant/Vagrantfile_Minimum | 173 ++++++++++++++++ | |
113 | Vagrant/Vagrantfile_Prebuilt | 120 +++++++++++ | |
114 | Vagrant/bootstrap.sh | 224 ++++++++++++++------- | |
115 | Vagrant/resources/GPO/rdp_users/manifest.xml | 1 + | |
116 | .../Backup.xml | 20 ++ | |
117 | .../microsoft/windows nt/SecEdit/GptTmpl.inf | Bin 0 -> 384 bytes | |
118 | .../bkupInfo.xml | 1 + | |
119 | .../gpreport.xml | Bin 0 -> 18348 bytes | |
120 | Vagrant/resources/caldera/caldera.service | 11 - | |
121 | Vagrant/resources/caldera/mongod.service | 12 -- | |
122 | Vagrant/resources/splunk_forwarder/wef_inputs.conf | 27 +++ | |
123 | .../splunk_server/asn-lookup-generator_012.tgz | Bin 102011 -> 0 bytes | |
124 | .../splunk_server/asn-lookup-generator_100.tgz | Bin 0 -> 102270 bytes | |
125 | Vagrant/resources/splunk_server/props.conf | 10 +- | |
126 | .../resources/splunk_server/threathunting_11.tgz | Bin 56718 -> 0 bytes | |
127 | .../resources/splunk_server/threathunting_12.tgz | Bin 0 -> 55432 bytes | |
128 | Vagrant/resources/splunk_server/transforms.conf | 2 +- | |
129 | Vagrant/resources/windows/MenuSettings.xml | 5 + | |
130 | Vagrant/resources/windows/TaskManager.reg | 156 ++++++++++++++ | |
131 | Vagrant/resources/windows/background.bmp | Bin 0 -> 6706110 bytes | |
132 | Vagrant/resources/windows/shutup10.cfg | 128 ++++++++++++ | |
133 | Vagrant/scripts/MakeWindows10GreatAgain.ps1 | 28 ++- | |
134 | Vagrant/scripts/bginfo.bgi | Bin 1440 -> 1588 bytes | |
135 | Vagrant/scripts/configure-AuditingPolicyGPOs.ps1 | 9 +- | |
136 | Vagrant/scripts/configure-ou.ps1 | 27 ++- | |
137 | Vagrant/scripts/configure-powershelllogging.ps1 | 12 +- | |
138 | .../scripts/configure-pslogstranscriptsshare.ps1 | 2 +- | |
139 | Vagrant/scripts/configure-rdp-user-gpo.ps1 | 29 +++ | |
140 | Vagrant/scripts/configure-wef-gpo.ps1 | 17 +- | |
141 | Vagrant/scripts/create-domain.ps1 | 18 +- | |
142 | Vagrant/scripts/download_palantir_osquery.ps1 | 4 +- | |
143 | Vagrant/scripts/download_palantir_wef.ps1 | 4 +- | |
144 | Vagrant/scripts/fix-second-network.ps1 | 1 + | |
145 | Vagrant/scripts/install-autorunstowineventlog.ps1 | 2 +- | |
146 | Vagrant/scripts/install-bginfo.ps1 | 1 + | |
147 | Vagrant/scripts/install-caldera-agent.ps1 | 35 ---- | |
148 | Vagrant/scripts/install-choco-extras.ps1 | 16 ++ | |
149 | Vagrant/scripts/install-inputsconf.ps1 | 30 +-- | |
150 | Vagrant/scripts/install-microsoft-ata.ps1 | 32 +-- | |
151 | Vagrant/scripts/install-osquery.ps1 | 4 +- | |
152 | Vagrant/scripts/install-redteam.ps1 | 51 +++++ | |
153 | Vagrant/scripts/install-splunkuf.ps1 | 4 +- | |
154 | Vagrant/scripts/install-sysinternals.ps1 | 19 +- | |
155 | Vagrant/scripts/install-utilities.ps1 | 82 ++------ | |
156 | Vagrant/scripts/install-wefsubscriptions.ps1 | 27 +-- | |
157 | Vagrant/scripts/install-windows_ta.ps1 | 8 +- | |
158 | Vagrant/scripts/join-domain.ps1 | 6 +- | |
159 | Vagrant/scripts/provision.ps1 | 20 +- | |
160 | build.ps1 | 206 +++++++------------ | |
161 | build.sh | 107 +++------- | |
162 | ci/README.md | 6 +- | |
163 | ci/build_machine_bootstrap.sh | 34 +++- | |
164 | ci/circle_workflows/packer_and_vagrant_changes.sh | 18 +- | |
165 | ci/circle_workflows/packer_changes.sh | 28 +-- | |
166 | ci/circle_workflows/vagrant_changes.sh | 49 +++-- | |
167 | ci/manual_machine_bootstrap.sh | 53 +++++ | |
168 | ci/manual_machine_bootstrap_vmware.sh | 63 ++++++ | |
169 | img/DetectionLab.png | Bin 0 -> 106161 bytes | |
170 | 85 files changed, 1719 insertions(+), 833 deletions(-) | |
171 | mode change 100644 => 100755 Packer/floppy/PinTo10.exe | |
172 | mode change 100644 => 100755 Packer/floppy/WindowsPowershell.lnk | |
173 | mode change 100644 => 100755 Packer/scripts/MakeWindows10GreatAgain.ps1 | |
174 | mode change 100644 => 100755 Packer/scripts/MakeWindows10GreatAgain.reg | |
175 | mode change 100644 => 100755 Packer/scripts/rearm-windows.ps1 | |
176 | mode change 100644 => 100755 Packer/scripts/sysprep.bat | |
177 | delete mode 100644 Terraform/Method1/terraform.tfvars | |
178 | delete mode 100644 Terraform/Method1/vm_import/logger.json | |
179 | create mode 100644 Terraform/Pre-Built_AMIs.md | |
180 | create mode 100644 Terraform/README.md | |
181 | rename Terraform/{Method1 => }/main.tf (60%) | |
182 | create mode 100644 Terraform/outputs.tf | |
183 | create mode 100644 Terraform/terraform.tfvars.example | |
184 | create mode 100644 Terraform/variables.tf | |
185 | rename Terraform/{Method1 => }/vm_import/dc.json (100%) | |
186 | rename Terraform/{Method1 => }/vm_import/role-policy.json (100%) | |
187 | rename Terraform/{Method1 => }/vm_import/trust-policy.json (100%) | |
188 | rename Terraform/{Method1 => }/vm_import/role-policy.json (100%) | |
189 | rename Terraform/{Method1 => }/vm_import/trust-policy.json (100%) | |
190 | rename Terraform/{Method1 => }/vm_import/wef.json (100%) | |
191 | rename Terraform/{Method1 => }/vm_import/win10.json (100%) | |
192 | create mode 100644 Vagrant/Vagrantfile_Minimum | |
193 | create mode 100644 Vagrant/Vagrantfile_Prebuilt | |
194 | create mode 100644 Vagrant/resources/GPO/rdp_users/manifest.xml | |
195 | create mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/Backup.xml | |
196 | create mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.in | |
197 | f | |
198 | create mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/bkupInfo.xml | |
199 | create mode 100644 Vagrant/resources/GPO/rdp_users/{87A41109-E0FA-4D74-BE50-9ED009D4BAAF}/gpreport.xml | |
200 | delete mode 100644 Vagrant/resources/caldera/caldera.service | |
201 | delete mode 100644 Vagrant/resources/caldera/mongod.service | |
202 | delete mode 100644 Vagrant/resources/splunk_server/asn-lookup-generator_012.tgz | |
203 | create mode 100644 Vagrant/resources/splunk_server/asn-lookup-generator_100.tgz | |
204 | delete mode 100644 Vagrant/resources/splunk_server/threathunting_11.tgz | |
205 | create mode 100644 Vagrant/resources/splunk_server/threathunting_12.tgz | |
206 | create mode 100755 Vagrant/resources/windows/MenuSettings.xml | |
207 | create mode 100644 Vagrant/resources/windows/TaskManager.reg | |
208 | create mode 100644 Vagrant/resources/windows/background.bmp | |
209 | create mode 100755 Vagrant/resources/windows/shutup10.cfg | |
210 | create mode 100644 Vagrant/scripts/configure-rdp-user-gpo.ps1 | |
211 | delete mode 100644 Vagrant/scripts/install-caldera-agent.ps1 | |
212 | create mode 100644 Vagrant/scripts/install-choco-extras.ps1 | |
213 | create mode 100644 Vagrant/scripts/install-redteam.ps1 | |
214 | create mode 100644 ci/manual_machine_bootstrap.sh | |
215 | create mode 100644 ci/manual_machine_bootstrap_vmware.sh | |
216 | create mode 100644 img/DetectionLab.png | |
217 | ||
218 | root@LAPTOP-HT4TGVCP C:\Users\root\git\detectionlab\DetectionLab>vagrant up | |
219 | Bringing machine 'logger' up with 'virtualbox' provider... | |
220 | Bringing machine 'dc' up with 'virtualbox' provider... | |
221 | Bringing machine 'wef' up with 'virtualbox' provider... | |
222 | Bringing machine 'win10' up with 'virtualbox' provider... | |
223 | There are errors in the configuration of this machine. Please fix | |
224 | the following errors and try again: | |
225 | ||
226 | shell provisioner: | |
227 | * `path` for shell provisioner does not exist on the host system: C:/Users/root/bootstrap.sh |