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

• 9e9152d6c1 lab updates Z. Cliffe Schreuders 2018-10-03 13:16:38 +01:00
• da9850a826 Merge branch 'stretch_kde_update' of https://github.com/cliffe/SecGen into stretch_kde_update Z. Cliffe Schreuders 2018-10-02 10:59:59 +01:00
• e4c9a98b22 Lab updates Z. Cliffe Schreuders 2018-10-02 10:59:47 +01:00
• b6af3ebe3e Updating VirtualBox bases: kali_light + kali_light_msf ts 2018-09-28 16:12:47 +01:00
• 7d832ea498 Updating VirtualBox bases: debian_stretch_desktop_kde ts 2018-09-28 16:12:22 +01:00
• 7042756f27 hackerbot update, added install.pp require for dependencies ts 2018-09-28 16:10:34 +01:00
• c4f2d54bcc Strip trailing spaces from GemExe.exe args ts 2018-09-28 08:41:18 +01:00
• 5ce8e14bff Updating VirtualBox bases: debian_stretch ts 2018-09-27 17:59:08 +01:00
• 2fc0bf74cf oVirt snapshots Z. Cliffe Schreuders 2018-09-27 15:30:20 +01:00
• ade9bce715 update logo Z. Cliffe Schreuders 2018-09-27 13:47:21 +01:00
• 44e137aec0 lab updates Z. Cliffe Schreuders 2018-09-27 13:44:02 +01:00
• 85f8bf5035 Merge branch 'stretch_kde_update' of https://github.com/cliffe/SecGen into stretch_kde_update Z. Cliffe Schreuders 2018-09-26 17:41:55 +01:00
• 4619a140c4 lab updates Z. Cliffe Schreuders 2018-09-26 17:41:41 +01:00
• 927e878c4a Fix for duplicate received_inputs from module outputs on conflict resolution (2/2) ts 2018-09-26 15:43:32 +01:00
• 2dc5c6d743 updates to metadata Z. Cliffe Schreuders 2018-09-26 14:41:19 +01:00
• e7adc14b02 Fix for duplicate received_inputs from module outputs on conflict resolution ts 2018-09-26 12:35:27 +01:00
• 950d0d4237 Temp fix: updated tomcat httpd to servlet to avoid conflicts. ts 2018-09-26 09:52:49 +01:00
• 20c95167e8 revert: change from wns branch... ts 2018-09-26 09:32:48 +01:00
• fba6ca3726 removing test base requires ts 2018-09-26 09:09:51 +01:00
• 35d53d0709 Lab updates Z. Cliffe Schreuders 2018-09-25 14:38:58 +01:00
• 987960c72a iceweasel default disable proxy + unix update retries w/ sleep to fix locking issue Z. Cliffe Schreuders 2018-09-25 13:23:02 +01:00
• 009974793c Vagrantfile update, no longer appending to /etc/network/interfaces for stretch kde + server as we've got 1 nic not 2. thomashaw 2018-09-24 18:30:01 +01:00
• 536659ff7f WiP Z. Cliffe Schreuders 2018-09-23 10:43:10 +01:00
• 8035c83973 updated hackerbot requires to be more specific as it depends on apache module ts 2018-09-21 17:06:21 +01:00
• 0ca88194b1 more stable tomcat url# ts 2018-09-21 16:50:29 +01:00
• b79d21e4d0 wip secgen server 2018-09-21 16:49:24 +01:00
• daafd6637b kde module updated for debian 9 stretch (todo: test me!) ts 2018-09-21 15:21:15 +01:00
• 5bb2523b47 sddm.conf secgen server 2018-09-21 15:07:56 +01:00
• a8f993f468 wip: kde module config.pp structure ts 2018-09-21 14:49:57 +01:00
• 60a25399d2 Revert "wip: removing update temporarily" ts 2018-09-21 14:49:29 +01:00
• c67ce99ecf wip: removing update temporarily ts 2018-09-21 14:25:19 +01:00
• 1d3de71330 wip: added network ts 2018-09-21 14:19:43 +01:00
• b1f13adde1 wip: testing $operatingsystemversion output... ts 2018-09-21 13:50:59 +01:00
• 34f0bd3862 gemfile lock secgen server 2018-09-21 13:18:24 +01:00
• b3bed65190 1_integrity_protection.xml: temporarily back to using wheezy ts 2018-09-21 12:37:43 +01:00
• 5208ae5cc7 Squashed WNS + IRI DL work ts 2018-09-21 12:27:42 +01:00
• 26f8978049 server push, using stretch iri_dl_hvhb1and2 secgen server 2018-09-21 12:06:07 +01:00
• becc3cd55c Debian bases update ts 2018-09-20 19:17:29 +01:00
• e3a885baf8 Merge branch 'iri_dl_hvhb1and2' of https://github.com/cliffe/SecGen into iri_dl_hvhb1and2 secgen server 2018-09-20 19:15:39 +01:00
• 4080e1a5a3 updated scenario 1 iri secgen server 2018-09-20 19:15:17 +01:00
• 7658d35448 temporary template name for testing ts 2018-09-20 11:57:02 +01:00
• 9128ea9580 added hackerbot dependencies secgen server 2018-09-20 11:39:50 +01:00
• ce693899e5 vagrantfile wip secgen server 2018-09-19 17:31:21 +01:00
• 6b7dc57b63 New version of tomcat Cliffe 2018-05-23 13:59:32 +01:00
• 5847ba6ed2 Java on Kali Cliffe 2018-05-23 07:02:04 +01:00
• 975d574dcb Don't reload networking Cliffe 2018-05-22 23:20:28 +01:00
• e5f2a88891 HvHB 1 and 2 Z. Cliffe Schreuders 2018-05-18 16:01:59 +01:00
• 1e66dad053 Updated README.md to include vagrant-ovirt4 dependencies ts 2018-04-20 10:56:43 +01:00
• 47a63f93c2 post-merge bugfix thomashaw 2018-03-20 13:50:24 +00:00
• f7a707a20c option to create snapshots Z. Cliffe Schreuders 2018-08-23 15:12:12 +01:00
• 6e8d3262d4 Merge branch 'master' of https://github.com/cliffe/SecGen Z. Cliffe Schreuders 2018-08-20 23:41:45 +01:00
• 1a90f1c67f update status when batch fails to create the project Z. Cliffe Schreuders 2018-08-20 23:41:14 +01:00
• f0bf31ff28 WiP Z. Cliffe Schreuders 2018-08-19 23:54:30 +01:00
• b6d9ed28dd print batch job list in json format Z. Cliffe Schreuders 2018-08-01 15:15:26 +01:00
• c76bc6f769 Merge branch 'master' of https://github.com/cliffe/SecGen Z. Cliffe Schreuders 2018-07-30 17:07:59 +01:00
• 0a0d050020 Print id when adding batch job Z. Cliffe Schreuders 2018-07-30 17:07:20 +01:00
• 5c6f1c28ff update README fixes #119 Cliffe 2018-07-26 14:56:00 +01:00
• b53408bce8 additional metadata for scenarios Z. Cliffe Schreuders 2018-07-10 23:39:57 +01:00
• 6ee6cc26c4 README updates and spiltting into separate files Z. Cliffe Schreuders 2018-07-05 12:01:51 +01:00
• e7e0d288bc Merge branch 'ctfd_output' Z. Cliffe Schreuders 2018-06-22 17:02:36 +01:00
• 93fd85a155 export to CTFd scoreboard (adapted to suit SecGen VM based challenges) Z. Cliffe Schreuders 2018-06-22 17:00:25 +01:00
• 3435c4a256 Bugfix: proftpd.erb template referred to local variable $secgen_parameters instead of @secgen_parameters (declared and parsed in configure.pp file) thomashaw 2018-06-22 12:37:48 +01:00
• aafaa3d648 fixed puppet resource naming conflict thomashaw 2018-06-20 19:14:46 +01:00
• 84065c2c75 added ovirt_template attribute to base type in scenario schema thomashaw 2018-06-20 17:44:22 +01:00
• 4f0484f463 Fixed issue where .tr! call on string encoder args containing strings of integers , e.g. "123".tr!(...) returns nil. thomashaw 2018-06-20 17:39:13 +01:00
• 56a4f5d789 CTFd WiP ctfd_output Z. Cliffe Schreuders 2018-06-18 17:23:28 +01:00
• 95535933d2 CTFd WiP Z. Cliffe Schreuders 2018-06-15 17:03:35 +01:00
• 1bc3b6b78f New version of tomcat hvhb1and2 Cliffe 2018-05-23 13:59:32 +01:00
• 87f0022d78 Java on Kali Cliffe 2018-05-23 07:02:04 +01:00
• 3f37d572de Don't reload networking Cliffe 2018-05-22 23:20:28 +01:00
• bf5237d247 HvHB 1 and 2 Z. Cliffe Schreuders 2018-05-18 16:01:59 +01:00
• 4a1e065724 Updated README.md to include vagrant-ovirt4 dependencies ts 2018-04-20 10:56:43 +01:00
• aaad9bd219 ads ids thomashaw 2018-03-22 21:14:51 +00:00
• 609099be57 revert me, dont merge this branch without revisions secgen server 2018-03-22 20:55:08 +00:00
• c0b22a9ecf Merge branch 'web_merge' of http://github.com/thomashaw/secgen into web_merge secgen server 2018-03-22 19:31:48 +00:00
• 15793b1e02 adding sudo to userspice script thomashaw 2018-03-22 19:47:29 +00:00
• 52139c4b47 adding sudo to userspice script thomashaw 2018-03-22 19:39:06 +00:00
• c9f43155f7 test scenario secgen server 2018-03-22 19:31:35 +00:00
• 56ac9e2e7d WiP userspice cron + test_scenario.xml thomashaw 2018-03-22 19:09:22 +00:00
• 6e6c9afd92 Merge branch 'web_merge' of http://github.com/thomashaw/secgen into web_merge secgen server 2018-03-22 18:33:04 +00:00
• a21cd2ade7 WiP userspice config script thomashaw 2018-03-22 18:49:36 +00:00
• 0ee1a64cef merge secgen server 2018-03-22 18:32:59 +00:00
• 391a75f057 WiP userspice change thomashaw 2018-03-22 18:33:29 +00:00
• 97e8b78071 WiP userspice change + scenario thomashaw 2018-03-22 18:24:26 +00:00
• 0df30e0dfc WiP gitlist uses apache 2.2 style .htaccess which is incompatible with stretch's apache 2.4 thomashaw 2018-03-22 17:45:50 +00:00
• ddb413c9a8 WiP Override -> All thomashaw 2018-03-22 17:21:20 +00:00
• 968dd4eb8e WiP: moinmoin gitlist stretch thomashaw 2018-03-22 17:02:56 +00:00
• a0c6685944 wp3 cron + mysql thomashaw 2018-03-22 15:06:02 +00:00
• 9959b5e11c WiP thomashaw 2018-03-22 13:44:17 +00:00
• df598b23d3 serv secgen server 2018-03-22 13:23:54 +00:00
• 5d0ab5e0ea merge secgen server 2018-03-22 13:04:08 +00:00
• 218c5b7732 WiP thomashaw 2018-03-22 13:18:59 +00:00
• de93e8139d store secgen server 2018-03-22 13:02:56 +00:00
• c5c0f36c44 metadata thomashaw 2018-03-22 12:33:13 +00:00
• 7c8876ae63 mysql stretch thomashaw 2018-03-22 12:32:46 +00:00
• 1770b5f0e4 wip thomashaw 2018-03-22 12:32:26 +00:00
• 44a6d70d8b uncommented retry loop secgen server 2018-03-22 11:41:26 +00:00
• 98a6c684c9 merge commit secgen server 2018-03-22 00:44:40 +00:00
• e32a4b6aa7 wip thomashaw 2018-03-22 01:00:33 +00:00
• 9af6caae1c merge secgen server 2018-03-22 00:44:00 +00:00