Commit Graph

Select branches

Hide Pull Requests

CyBOK-lecture-updates

OSSEC2

RSA_LAB_squash

anass_modules

auto_grading180621

auto_grading_dev

c_code

challenge_generators

ctf_challenges

ctf_challenges_merge

ctf_pwn_setuid

ctfd_output

es7_merge_1511

ff2

hvhb1and2

ids_lab

ids_test

iri_dl_hvhb1and2

january_19_merge

labtainers

live_lab

logging_system

master

orientation

ovirt_networking

phishing

post_tests

pr/109

rema_coconut_merge

rsa_fixes_1123

s2progress

stretch_kde_update

stretch_kde_update_2

stretch_merge

team_project

thomashaw-patch-1

web_merge

web_userspice

#1

#10

#103

#104

#104

#109

#109

#11

#12

#125

#126

#134

#135

#136

#137

#138

#142

#144

#150

#153

#16

#16

#166

#168

#168

#17

#172

#18

#184

#188

#19

#190

#191

#194

#195

#198

#2

#2

#20

#200

#201

#203

#204

#207

#209

#21

#21

#210

#211

#217

#218

#22

#22

#222

#223

#229

#23

#230

#232

#232

#233

#234

#234

#235

#235

#236

#237

#237

#238

#239

#24

#240

#241

#241

#242

#243

#244

#245

#246

#246

#247

#248

#249

#25

#25

#250

#251

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#259

#259

#260

#260

#261

#262

#262

#263

#263

#264

#264

#265

#267

#268

#269

#270

#271

#272

#273

#274

#275

#276

#277

#278

#278

#279

#280

#282

#283

#284

#284

#285

#287

#296

#297

#298

#299

#3

#30

#300

#300

#302

#306

#307

#308

#309

#31

#31

#311

#312

#313

#314

#32

#33

#336

#338

#340

#341

#344

#345

#346

#347

#348

#349

#35

#350

#351

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#360

#360

#361

#361

#362

#362

#38

#39

#4

#40

#41

#41

#42

#43

#44

#45

#46

#47

#47

#49

#5

#50

#52

#53

#54

#54

#55

#57

#57

#58

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#73

#74

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#82

#83

#84

#86

#86

#87

#88

#89

#9

#90

#92

#93

#93

#95

Mono Color

• 90cf6885b4 labs scenario cleanup thomashaw 2017-10-20 10:42:24 +01:00
• c0c180a9aa Adding an example and README entry for the network-ranges / IP_addresses datastore / inputting an IP_address into a network module. thomashaw 2017-10-20 10:41:09 +01:00
• e0608685e8 WiP Z. Cliffe Schreuders 2017-10-20 03:03:02 +01:00
• ba97acdcb2 WiP Z. Cliffe Schreuders 2017-10-19 22:54:46 +01:00
• bef37ab388 WiP Z. Cliffe Schreuders 2017-10-19 16:13:41 +01:00
• ff9cf9f84f WiP Z. Cliffe Schreuders 2017-10-19 15:56:27 +01:00
• 343978da35 WiP Z. Cliffe Schreuders 2017-10-18 23:56:41 +01:00
• 8e4915b2f0 WiP Z. Cliffe Schreuders 2017-10-18 16:15:52 +01:00
• 265fd87ae1 updated IRI lab scenarios to use the new datastore="IP_addresses" functionality thomashaw 2017-10-18 15:40:01 +01:00
• 6e56a25be9 network changes cleanup - no need for <network/> changes thomashaw 2017-10-18 15:03:26 +01:00
• 0033a7c642 network-ranges => scenario passthrough / rework thomashaw 2017-10-18 14:57:53 +01:00
• b550ce8eac WiP Z. Cliffe Schreuders 2017-10-17 23:22:41 +01:00
• 38c5e5fe93 WiP Z. Cliffe Schreuders 2017-10-17 17:26:18 +01:00
• 444d9ea9eb batch_secgen: changed default option of random ip range exclusion to Y thomashaw 2017-10-17 10:23:14 +01:00
• a4959de5fa wip Z. Cliffe Schreuders 2017-10-16 17:27:53 +01:00
• f35ba6cd9b wip Z. Cliffe Schreuders 2017-10-16 17:27:33 +01:00
• 97f6011fa9 Merge remote-tracking branch 'upstream/backup_lab' into labs_squashed_rwrk thomashaw 2017-10-13 16:59:38 +01:00
• 624e542d86 formatting thomashaw 2017-10-13 16:59:01 +01:00
• e62a53dcb5 More labsheet fixes Z. Cliffe Schreuders 2017-10-13 16:28:05 +01:00
• a3adbdb331 Minor labsheet fixes Z. Cliffe Schreuders 2017-10-13 16:22:05 +01:00
• a95d957962 fixed destroy only broken vms secgen server 2017-10-13 16:20:24 +01:00
• 39faceccbf Minor labsheet fixes Z. Cliffe Schreuders 2017-10-13 16:02:29 +01:00
• 7fd9d80e1a More changes to retry destroy <failed_vm> thomashaw 2017-10-13 15:24:37 +01:00
• d62c15137f Changes to retry destroy <failed_vm> and shortened hackerbot_server in system name to hb_server thomashaw 2017-10-13 14:35:24 +01:00
• 0af894caf7 backups lab Z. Cliffe Schreuders 2017-10-13 13:20:10 +01:00
• fccd4e0b33 Only destroy broken VMs thomashaw 2017-10-13 13:48:08 +01:00
• 3a5bd1a288 backups lab Z. Cliffe Schreuders 2017-10-13 13:20:10 +01:00
• 6b87f6ca31 pushing work from server secgen server 2017-10-13 11:47:39 +01:00
• a68079786e Merge branch 'labs_squashed_rwrk' of https://github.com/cliffe/SecGen into labs_squashed_rwrk secgen server 2017-10-09 12:06:32 +01:00
• e8a3e82d81 lab2 thomashaw 2017-10-09 12:00:04 +01:00
• 0d91381c15 WiP: wrap network_ranges check in conditional thomashaw 2017-10-09 11:28:39 +01:00
• 896314834d merging secgen server 2017-10-07 14:21:32 +01:00
• 5b751a1ed1 merge me secgen server 2017-10-07 14:21:00 +01:00
• a65d19d85e Adding --provision to retry loop. thomashaw 2017-10-07 14:18:39 +01:00
• 3e1f9c9b46 batch_secgen: Added --all to reset command. thomashaw 2017-10-07 14:17:54 +01:00
• 606396a678 Merge branch 'labs_squashed_rwrk' of https://github.com/cliffe/SecGen into labs_squashed_rwrk secgen server 2017-10-07 11:40:53 +01:00
• ad8481b999 added sleep to batch secgen server 2017-10-07 11:40:49 +01:00
• 0ee163d729 batch_secgen: Added reset command. Reset all jobs with status 'running' or 'error' to 'todo'. thomashaw 2017-10-07 11:36:05 +01:00
• 2c40d1632b student ids thomashaw 2017-10-05 19:48:35 +01:00
• 69cf1c57b8 added - and shorter server name for IRI labs thomashaw 2017-10-05 15:11:50 +01:00
• 7283d1979a re-added environment to batch-secgen.service secgen server 2017-10-05 14:54:25 +01:00
• 46e4d26915 Vagrantfile.erb: Renamed SPICE => spice thomashaw 2017-10-05 14:36:00 +01:00
• 7cfde8317a Rework WIP: Testing changes so far. Still need to rework network-ranges passthrough hack with something more flexible. thomashaw 2017-10-05 14:24:56 +01:00
• 7abaabe9b6 move <ovirt_template> next to basebox url in metadata and schema thomashaw 2017-10-05 11:49:59 +01:00
• 2a7229e6fa batch-secgen.service: added user & group to run service as thomashaw 2017-10-05 11:48:20 +01:00
• 78ba59776a batch_secgen: Automatically back up the projects/ directory of successful projects, added prompt on excluding ranges currently in table from randomised ip generation. thomashaw 2017-10-05 11:47:26 +01:00
• ce502abcdb Hackerbot, labs, and associated changes Z. Cliffe Schreuders 2017-09-28 16:35:28 +01:00
• cef610bf04 oVirt now uses VM memory allocation based on command line options. Added missing options to usage. Added default memory allocations for oVirt VMs based on base type. thomashaw 2017-09-28 14:55:21 +01:00
• d43fe74492 Vagrantfile: oVirt hostname, replace _ with - in full hostname string, rather than just system_name. Fixes error when prefix contains underscores. thomashaw 2017-09-28 13:47:22 +01:00
• 1c44c7baec utilities/handy_cli_tools thomashaw 2017-09-26 19:42:28 +01:00
• fe7c81dfc0 utilities/kde_minimal thomashaw 2017-09-26 19:41:47 +01:00
• 439605c10b utilities/metasploit_framework thomashaw 2017-09-26 19:41:37 +01:00
• e814a7fe03 scenarios/labs/incremental_base_boxes.xml thomashaw 2017-09-26 19:41:09 +01:00
• 01baa313fc ovirt-integration: reverting cloud-init change and included it in base template instead thomashaw 2017-09-26 18:58:13 +01:00
• 8e38813db2 Updates: SecGen => oVirt Integration thomashaw 2017-09-21 19:51:32 +01:00
• 0c13e77c23 Vagrantfile fix thomashaw 2017-09-21 16:33:57 +01:00
• 3205338f67 renamed postgresql database from secgen_batch to batch_secgen for consistency thomashaw 2017-09-21 15:58:53 +01:00
• 662a82353d updated usage and added to readme thomashaw 2017-09-20 15:14:05 +01:00
• ac89f97c98 renamed secgen.conf => example.conf (note: don't store secgen.conf within git repo) thomashaw 2017-09-20 14:56:23 +01:00
• a96c249e63 ovirt integration: removed usage comment as we're using .conf files with arguments instead of setting default values within Vagrantfile.erb thomashaw 2017-09-20 14:51:45 +01:00
• abc7e28893 ovirt integration: removed ovirt-vmname option + build the vm name based on prefix and <system_name> thomashaw 2017-09-20 14:47:14 +01:00
• 2a1658da85 secgen.conf: stored arguments which are added to ARGV thomashaw 2017-09-20 14:15:03 +01:00
• 3fa05c0889 batch_secgen.rb: adding --randomise-ips thomashaw 2017-09-20 13:01:53 +01:00
• f2e31f6da6 secgen.rb: corrected mistake in usage thomashaw 2017-09-20 11:00:37 +01:00
• f42555350b secgen.rb: adding --network-ranges thomashaw 2017-09-20 10:38:38 +01:00
• 447059ce20 WIP: templates in bases thomashaw 2017-09-18 12:16:35 +01:00
• f58fb0d2b4 WIP: ovirt templates -> bases thomashaw 2017-09-18 11:25:56 +01:00
• e30d4b007c oVirt Help Update Gajendra 2017-08-23 23:44:55 +01:00
• 4ac2cd3ddc oVirt provider spinup with multiple options - ovirturl, ovirtpass, ovirtuser, ovirt-vmname, ovirtcluster, ovirttemplate etc Gajendra 2017-08-23 23:14:14 +01:00
• 24ce91af38 cleanup: removed reference to <breadcrumb> thomashaw 2017-09-20 22:21:38 +01:00
• b5bb17ee59 minor improvements to leaked_file permissions, metadata, and scenarios thomashaw 2017-09-20 22:08:40 +01:00
• c70263a8e0 basic_narrative.xml: no longer selects strong passwords for user1, reordered text on website. thomashaw 2017-09-20 16:31:12 +01:00
• ff3f360b81 batch_secgen.rb: added postgresql requirements to readme (fixed) thomashaw 2017-09-20 15:37:19 +01:00
• fa2047298e batch_secgen.rb: added postgresql requirements to readme thomashaw 2017-09-20 15:30:07 +01:00
• 889c620189 secgen_batch: updated db interactions thomashaw 2017-09-17 12:03:46 +01:00
• 1a611e230b SecGen batch processing script (requires postgresql). secgen.rb: added --shutdown flag for shutting down vm's after provisioning thomashaw 2017-09-15 15:54:50 +01:00
• bfa430ba52 generator/concat_paragraph: concatenate data multiple input generators, with optional separators thomashaw 2017-09-05 17:43:59 +01:00
• 02f191104d generator/credit_card_data: outputs credit card type and number thomashaw 2017-09-05 17:41:50 +01:00
• 489eb76e47 README.md: minor change thomashaw 2017-09-05 15:59:01 +01:00
• 09a15ae7c8 README.md: description of access_json thomashaw 2017-09-05 15:56:00 +01:00
• 521206c03f moved json_selection_example.xml to the correct directory thomashaw 2017-09-05 15:48:53 +01:00
• a7b75765ab generators/realistic_organisation: added an organisation generator which uses the business_name for domain and email addresses. renamed generators/organisation to generators/random_organisation thomashaw 2017-09-05 13:45:18 +01:00
• fa5015918b corrected method call thomashaw 2017-09-05 12:31:17 +01:00
• 70e9d5cc27 generators/business_email: corrected method call thomashaw 2017-09-05 12:28:17 +01:00
• 705383e108 encoder/random_string_selector: cleaned up print_string output. other encoders: added encoding print string padding thomashaw 2017-09-05 11:26:29 +01:00
• c2ed5c13e6 removed newlines thomashaw 2017-09-04 12:45:13 +01:00
• fb17704711 basic_narrative.xml: use parse_json datastore changes and organisations thomashaw 2017-09-04 12:39:06 +01:00
• f86025f343 access_element removed (redundant, use access='0' instead) thomashaw 2017-08-30 16:11:01 +01:00
• 8e73786945 Merge pull request #103 from eelsivart/master Tom 2017-08-25 12:47:04 +01:00
• 9bd2f9a4e0 Create secgen_metadata.xml eelsivart 2017-08-23 07:03:56 -07:00
• bbb82382f7 Puppetfile.erb: enforce puppetlabs-stdlib 4.18.0 due to undefined resource problem in version 4.19.0 thomashaw 2017-08-23 13:53:40 +01:00
• aa11158832 basic_narrative.xml: revert new parse_json datastore changes thomashaw 2017-08-21 07:23:10 +01:00
• 06159f8d39 bugfix: smb share template thomashaw 2017-08-20 12:56:23 +01:00
• 328c526df7 Added error message with exit code 1 from SecGen if VM creation fails thomashaw 2017-08-19 16:48:02 +01:00
• 0d5bd58fdc scenarios: updating base box selectors to include type="server" (along side platform="linux") in preparation for kali basebox merge thomashaw 2017-08-19 13:52:03 +01:00
• 8b2a92915e vulnerabilities/vsftpd_234_backdoor: now uses organisations thomashaw 2017-08-19 13:44:16 +01:00
• 458eb3be81 vulnerabilities/proftpd_133c_backdoor: now uses organisations thomashaw 2017-08-19 13:19:36 +01:00
• 71794e13a1 vulnerabilities/unrealirc_3281: now uses organisations thomashaw 2017-08-19 12:50:02 +01:00
• 6b0614221c Merge branch 'master' of https://github.com/cliffe/SecGen thomashaw 2017-08-19 12:23:38 +01:00
• aa23500fdd vulnerabilities/moinmoin_195: now uses organisations thomashaw 2017-08-19 12:23:25 +01:00