From 483a09597e3289d365ccacae4f04dc37667818d5 Mon Sep 17 00:00:00 2001
From: ajmorton <ajmorton2@gmail.com>
Date: Sat, 5 Sep 2020 12:14:25 +1000
Subject: [PATCH] Add .gitignore and .gitlab-ci.yml
---
.gitignore | 27 +++++++++++++++++++++++++++
.gitlab-ci.yml | 19 +++++++++++++++----
README.md | 3 +++
bin/.gitignore | 4 ++++
tests/.gitignore | 4 ++++
5 files changed, 53 insertions(+), 4 deletions(-)
create mode 100644 .gitignore
create mode 100644 bin/.gitignore
create mode 100644 tests/.gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40ac3c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,27 @@
+# ignore everything not whitelisted
+*
+
+# whitelist dot files
+!.gitignore
+!.gitlab-ci.yml
+
+# whitelist helper scripts
+!build.sh
+!eng_unimelb_setup
+!get_coverage.sh
+!Makefile
+!README.md
+!run_fuzzer.sh
+!run_tests.sh
+
+#whitelist folders
+!fuzzer/
+!poc/
+!src/
+
+# ignore all compiled Java files in the whitelisted folders
+**/*.class
+
+# ignore all compiled C files in the whitelisted folders
+**/*.o
+**/*.a
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6691648..5fe08ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
stages:
- check_elig
+ - compile
- validate_tests
- validate_progs
- submit
@@ -11,7 +12,17 @@ check_submitter_eligibility:
tags:
- "swen90006-tourney"
script:
- - python3 ~/swen_tourney/frontend.py check_eligibility $(realpath $(pwd))
+ - python3.8 ~/swen_tourney/frontend.py check_eligibility ${CI_PROJECT_NAMESPACE} ${CI_PROJECT_NAME} ${CI_PROJECT_DIR}
+ allow_failure: false
+
+compile:
+ stage: compile
+ only:
+ - master
+ tags:
+ - "swen90006-tourney"
+ script:
+ - python3.8 ~/swen_tourney/frontend.py compile ${CI_PROJECT_NAMESPACE}
allow_failure: false
validate_tests:
@@ -21,7 +32,7 @@ validate_tests:
tags:
- "swen90006-tourney"
script:
- - python3 ~/swen_tourney/frontend.py validate_tests $(realpath $(pwd))
+ - python3.8 ~/swen_tourney/frontend.py validate_tests ${CI_PROJECT_NAMESPACE}
allow_failure: false
validate_progs:
@@ -31,7 +42,7 @@ validate_progs:
tags:
- "swen90006-tourney"
script:
- - python3 ~/swen_tourney/frontend.py validate_progs $(realpath $(pwd))
+ - python3.8 ~/swen_tourney/frontend.py validate_progs ${CI_PROJECT_NAMESPACE}
allow_failure: false
submit:
@@ -41,5 +52,5 @@ submit:
tags:
- "swen90006-tourney"
script:
- - python3 ~/swen_tourney/frontend.py submit $(realpath $(pwd))
+ - python3.8 ~/swen_tourney/frontend.py submit ${CI_PROJECT_NAMESPACE}
allow_failure: false
diff --git a/README.md b/README.md
index db8a2f4..b8b828a 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,15 @@ Structure of this repository:
* src/vuln-1 -- src/vuln-5 - where your vulnerable versions will live
* poc/: - where your PoCs will live
* fuzzer/: - where your fuzzer will live
+* bin/: - where your compiled programs will live
+* tests/: - where your generated tests will live
Pre-Included Scripts:
* Makefile - makefile for building the C implementation etc.
* get_coverage.sh - script to generate coverage reports
* run_fuzzer.sh - script for running your fuzzer to generate inputs
+* run_tests.sh - script for running your generated tests against compiled programs
Vulnerable Versions (you should put your security vulnerabilities in here):
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..dc3f8e3
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,4 @@
+# Ignore all files in this folder other than .gitignore
+# We don't want compiled objects in our git history
+*
+!.gitignore
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..40bcc30
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,4 @@
+# Ignore all files in this folder other than .gitignore
+# We don't want generated tests in our git history
+*
+!.gitignore
--
GitLab