trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
230 Commits 1 Branch 0 Tags
da57f05b4a8545aafd3a1917facdf909ce3d7b5d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris LongandGitHub da57f05b4a Revert last change 2019-03-11 22:31:40 -07:00
Chris LongandGitHub 612474c6da Change order of configure-ou.ps1 
Attempting to debug issue #221
 2019-03-10 20:03:30 -07:00
Chris LongandGitHub 235dfe5519 Merge pull request #220 from clong/remove_method_folder 
Removing method1 folder
 2019-03-09 22:15:32 -08:00
Chris Long 95e4c071ae Removing method1 folder 2019-03-09 22:14:45 -08:00
Chris LongandGitHub 95343c9c69 Adding variables.tf 2019-03-09 22:13:30 -08:00
Chris LongandGitHub d35c653df0 Fix typo 2019-03-09 22:11:30 -08:00
Chris LongandGitHub ea4f25d7aa Update .gitignore 
Adding entries for the newly modified Terraform directory structure
 2019-03-09 22:11:08 -08:00
Chris LongandGitHub 345ef061cd Update Pre-Built_AMIs.md 2019-03-09 21:34:27 -08:00
Chris LongandGitHub e43fc6cd97 Merge pull request #218 from clong/terraform_prebuilt_amis 
Add pre-built AMIs to Terraform and update documentation
 2019-03-09 21:30:40 -08:00
Chris Long 26140b2d41 Add pre-built AMIs to Terraform and update documentation 2019-03-09 21:28:06 -08:00
Chris LongandGitHub 5978e1b750 Update caldera.service 
Updated python3.6 path after installing from apt rather than source
 2019-03-08 23:46:28 -08:00
Chris LongandGitHub 64da28c8c5 Merge pull request #217 from clong/bootstrap_update 
Update bootstrap.sh
 2019-03-08 23:23:08 -08:00
Chris LongandGitHub ed74fdcb71 Update bootstrap.sh 
Address Issues #214 and #215
 2019-03-08 23:22:08 -08:00
Chris LongandGitHub 2fc9ae6453 Merge pull request #212 from clong/update_win10_march 
Update Win10 boxes, hashes, update build Vagrant to 2.2.4
 2019-03-03 16:19:40 -08:00
Chris Long 9c1423de76 Update Win10 boxes, hashes, update build Vagrant to 2.2.4 2019-03-03 16:14:18 -08:00
Chris LongandGitHub a9db407433 Merge pull request #210 from clong/march_update_1 
Update Splunk apps, create vagrantfile_minimum, bugfixes
 2019-03-02 11:57:24 -08:00
Chris Long a4a074ad24 Removing Microsoft-Message-Analyzer as it conflicts with Microsoft ATA 2019-03-02 10:28:05 -08:00
Chris Long ebdaa07080 Fixing working in choco and redteam 2019-03-01 22:51:26 -08:00
Chris Long c732ba6908 Reverting vagrantfile changes 2019-03-01 22:46:50 -08:00
Chris Long 93183a95e2 Update Splunk apps, create vagrantfile_minimum, bugfixes 2019-03-01 22:45:37 -08:00
Chris LongandGitHub ef566fc5ef Merge pull request #200 from clong/shutup_10 
Add ShutUp10, Upgrade Vagrant, Fix powershell Host Extraction
 2019-02-19 16:06:21 -08:00
Chris LongandGitHub 9c3535bb0e Merge branch 'master' into shutup_10 2019-02-19 16:05:58 -08:00
Chris Long 58c34429c8 Fixing directory version number 2019-02-19 08:53:03 -08:00
Chris Long 020af3c936 Add ShutUp10, Upgrade Vagrant, Issue 12 2019-02-18 21:47:03 -08:00
Chris LongandGitHub b08084fdf0 Merge pull request #196 from keepwatch/patch-1 
Fixing documented build.ps1 arguments [ci skip]
 2019-02-08 11:36:23 -08:00
Chris LongandGitHub a110e51856 Merge pull request #191 from fsacer/patch-1 
Issues with dpkg resolved [ci skip]
 2019-01-28 23:09:01 -08:00
Chris LongandGitHub 1ab3e4c699 Merge pull request #189 from clong/fix_terraform_typos 
Fix terraform typos [ci skip]
 2019-01-09 00:41:20 -08:00
Chris LongandGitHub 6cda7960d2 Remove device name from win10.json 2019-01-09 00:40:38 -08:00
Chris LongandGitHub c3c9914a88 Remove device name from wef.json 2019-01-09 00:40:24 -08:00
Chris LongandGitHub b78be6d260 Remove device name from logger.json 2019-01-09 00:40:09 -08:00
Chris LongandGitHub ae65a7cd76 Remove device name from dc.json 2019-01-09 00:39:54 -08:00
Chris LongandGitHub 9e019c2a7a Fix string typo on main.tf 2019-01-09 00:39:28 -08:00
Chris LongandGitHub 87ef15ade9 Build.ps1 to use TLSv1.2 [ci skip] 
Addresses issue with Fleet in https://github.com/clong/DetectionLab/issues/188
 2019-01-08 22:49:40 -08:00
Chris LongandGitHub 3157fa12e6 Merge pull request #187 from clong/terraform_method_1 
Adding Terraform Config for Method 1 [ci skip]
 2019-01-06 21:11:28 -08:00
Chris Long e05e636a9a Initial terraform configuration 2019-01-06 21:10:07 -08:00
Chris Long 409ba689ec Initial terraform configuration 2019-01-06 21:07:49 -08:00
Chris LongandGitHub 162f5ce552 Merge pull request #185 from clong/contributing 
Adding CONTRIBUTING.md [ci skip]
 2018-12-22 21:40:49 -08:00
Chris Long c0da758300 Adding CONTRIBUTING.md 2018-12-22 21:39:53 -08:00
Chris LongandGitHub 147a714aee Merge pull request #182 from clong/require_circleci_approval 
Update CircleCI job to include approval workflow
 2018-12-22 15:41:45 -08:00
Chris Long 28a0df75bb Update CircleCI job to include approval workflow 2018-12-22 15:32:43 -08:00
Chris LongandGitHub e15bf00ecb Merge pull request #181 from clong/fleet_update 
Update Fleet and use Fleetctl for pack imports.
 2018-12-21 15:21:56 -08:00
Chris Long 05f1f41930 Update osquery paths to reflect updates to repo 2018-12-20 19:02:08 -08:00
Chris Long 91012842b1 Update Fleet and use Fleetctl for pack imports. 2018-12-20 14:48:59 -08:00
Chris LongandGitHub 0f7e4602e9 Updating file hashes on README.md [ci skip] 2018-12-18 11:29:25 -08:00
Chris LongandGitHub 239e2acf0d Merge pull request #178 from clong/dec_box_refresh 
Updating VMware and Virtualbox boxes & README.md
 2018-12-15 11:11:14 -08:00
Chris Long 87ba56f7c6 Don't re-run CircleCI when merged into master 2018-12-14 21:02:59 -08:00
Chris Long a9b48a9d75 Updating VMware and Virtualbox boxes & README.md 2018-12-14 20:25:50 -08:00
Chris LongandGitHub 602b0e1431 Merge pull request #177 from clong/threat_hunting [ci skip] 
Adding Olaf's Threat Hunting App. Fixes. Updates. [ci skip]
 2018-12-11 15:42:55 -08:00
Chris LongandGitHub 75c91331aa Merge branch 'master' into threat_hunting 2018-12-11 00:55:41 -08:00
Chris Long 8b9178685a Adding Olaf's Threat Hunting App. Fixes. Updates. 2018-12-11 00:52:46 -08:00
Chris LongandGitHub 0f5d5b95b4 Add a backup for CI build provisioning 2018-12-07 00:17:34 -08:00
Chris LongandGitHub 52faea3e67 Override virtualbox NIC type 
Addressing  https://github.com/clong/DetectionLab/issues/170
 2018-12-06 23:47:26 -08:00
Chris LongandGitHub c31165e0cd Merge pull request #174 from clong/vagrant_2.2.2 
Update Vagrant in CI to 2.2.2 and drop privs for windows shell provisioning steps
 2018-12-05 15:48:56 -08:00
Chris LongandGitHub 9e19393138 Ignore Microsoft-Windows-LiveId when clearing event channels 
Addresses https://github.com/clong/DetectionLab/issues/171
 2018-12-05 13:46:38 -08:00
Chris LongandGitHub e547dc1ff9 Set privilege to false for all windows shell cmds 
https://github.com/clong/DetectionLab/issues/172
 2018-12-05 01:22:10 -08:00
Chris LongandGitHub c0370af30a Updating CI Vagrant & Packer versions 2018-12-05 01:20:36 -08:00
Chris LongandGitHub 9b255e9398 Packer: Update guest additions for VMware and VirtualBox [ci skip] 2018-10-30 18:25:26 -07:00
Chris LongandGitHub 553ecbaaf4 Add TLSv1.2 support to install-bginfo.ps1 2018-10-30 14:13:50 -07:00
Chris LongandGitHub d763d66dc2 Drop the firewall in Win10 host [ci skip] 2018-09-25 22:48:26 -07:00
Chris LongandGitHub f1edbb10bd Merge pull request #140 from dmi3mis/patch-3 
Add code to section "Excluding NAT interface from DNS"
 2018-09-25 22:44:55 -07:00
Chris LongandGitHub 3af54d5003 Merge branch 'master' into patch-3 2018-09-25 22:44:47 -07:00
Chris LongandGitHub 63e4b29e4a Add boot timeout to win10 host in Vagrantfile [ci skip] 2018-09-13 10:40:00 -07:00
Chris LongandGitHub a6bcbab794 Fix typo in bootstrap [ci skip] 2018-09-08 17:39:50 -07:00
Chris LongandGitHub d955b2c027 Merge pull request #150 from clong/donations 
Update README hashes, add donation buttons [ci skip]
 2018-09-08 14:20:58 -07:00
Chris Long 48b01104e1 Update README hashes, add donation buttons [ci skip] 2018-09-08 14:18:17 -07:00
Chris LongandGitHub 0f667e3818 Give suricata time to start [ci skip] 
The pgrep check is failing if Suricata doesn't start fast enough
 2018-09-08 09:55:36 -07:00
Chris LongandGitHub 053205a025 Merge pull request #149 from clong/suricata_and_ip_fixes 
Multiple fixes, additions [ci skip]
 2018-09-07 22:16:22 -07:00
Chris Long 6ad4dcf2b4 Update CI env, add some packer changes 2018-09-07 18:07:31 -07:00
Chris Long 9a82f140f4 Actually add the app 2018-09-07 14:58:11 -07:00
Chris Long a95143a2d3 Fix formatting, add Splunk ASN lookup app 2018-09-07 14:57:53 -07:00
Chris Long ba7784e0e8 Multiple fixes, additions 2018-09-06 22:58:36 -07:00
Chris LongandGitHub ef84579aa7 Merge pull request #139 from dmi3mis/patch-1 
Rename virtualbox VM names to predictable [ci skip]
 2018-09-05 08:41:36 -07:00
Chris LongandGitHub 4529c7fd0b Merge branch 'master' into patch-1 2018-09-05 08:41:25 -07:00
Chris LongandGitHub 0807060af9 Merge pull request #145 from jbeley/master 
added sed line to fix suricata build [ci skip]
 2018-09-05 08:36:01 -07:00
Chris LongandGitHub 16ecf5bbc8 Add success notification for reloaded vagrants to build.sh [ci skip] 
If a host finished provisioning successfully after a reload, it would not print the "success!" message. This commit fixes that. This is potentially what caused the problem in #135. [ci skip]
 2018-09-04 07:51:21 -07:00
Chris LongandGitHub 98de0cd20d Updating README after bro/suricata [ci skip] 
[ci skip]
 2018-09-03 21:23:14 -07:00
Chris LongandGitHub e385956ff9 Merge pull request #137 from jbeley/master 
Add bro and suricata to detectionlab
 2018-09-03 21:20:41 -07:00
Chris LongandGitHub 8ee53ad2c9 Merge branch 'master' into master 2018-08-29 20:07:48 -07:00
Chris LongandGitHub 63d0c8a937 Update ISO url for Server2016 [ci skip] 
[ci skip]
 2018-08-29 10:20:44 -07:00
Chris LongandGitHub 36708ec3a7 Fix typo in build.ps1 [ci skip] 
Addresses #128 [ci skip]
 2018-07-31 09:04:08 -07:00
Chris LongandGitHub e5625df52a Merge pull request #127 from clong/vmrun_bug_fixes 
Multiple bug fixes
 2018-07-31 00:02:14 -07:00
Chris Long 95e177f5aa Fixing bugs 2018-07-30 21:54:42 -07:00
Chris LongandGitHub 7d4bb4d78b Merge pull request #126 from H8to/H8to-patch-1 
Disable screen turnoff
 2018-07-28 16:03:49 -07:00
Chris LongandGitHub 199075e412 Merge branch 'master' into H8to-patch-1 2018-07-26 15:12:06 -07:00
Chris LongandGitHub 428b248f22 Merge pull request #124 from clong/bootstrap_ta_update 
Updating build scripts, TA's, Splunk & bootstrap
 2018-07-26 15:08:02 -07:00
Chris Long 6370af1eae Updating windows_ta script to point to the correct version 2018-07-23 12:30:30 -07:00
Chris Long 02f3720a29 Adding README updates 2018-07-20 22:34:16 -07:00
Chris Long ca7dec8eb1 Updating build scripts to use vmware_desktop, update TA's, update bootstrap 2018-07-20 22:28:44 -07:00
Chris LongandGitHub d3adc84e13 Update build.sh 
Correcting the non-existent operator that I made up
 2018-07-03 09:12:58 -07:00
Chris LongandGitHub 6e6322bdb9 Fixing io redirection in reload_host() function 2018-07-02 21:20:36 -07:00
Chris LongandGitHub 9355480a8d Update build.sh 
Fix some of the output redirection that was messing up return codes
 2018-07-02 12:12:47 -07:00
Chris LongandGitHub ddbf173fd5 Merge pull request #118 from clong/update_vagrant_log_path 
Update vagrant log path
 2018-06-29 11:15:10 -07:00
Chris Long 20e5891405 Updating to Vagrant 2.1.2 2018-06-29 07:14:51 -07:00
Chris Long e8260dbb08 Updating vagrant log path in CI build 2018-06-29 07:13:12 -07:00
Chris LongandGitHub 5a2d629a0b Merge pull request #117 from clong/updating_hashes_june_2018 
Updating hashes for pre-built boxes and small fixes
 2018-06-29 07:06:45 -07:00
Chris Long b9b65601a6 Updating hashes for pre-built boxes and small fixes 2018-06-28 23:20:24 -07:00
Chris LongandGitHub 1585afd1dc Merge pull request #116 from clong/1804 
1804 and multiple fixes
 2018-06-27 09:07:10 -07:00
Chris LongandGitHub e3c54cf651 Merge branch 'master' into 1804 2018-06-27 09:05:48 -07:00
Chris Long a105722872 Adding some small fixes 2018-06-26 23:48:11 -07:00
Chris Long 4ac14cb432 Fixing 7zip download and packer build ordering 2018-06-24 13:29:13 -07:00