Merge branch 'removed_unnecessary_folder'

.travis.yml

@@ -16,7 +16,7 @@ script:
   - find ~/build/ysoftdevs/wapifuzz/ -type f -exec dos2unix {} \;
   - find ~/build/ysoftdevs/wapifuzz/ -type f -name "*.sh" -exec chmod u+x {} \;
   - cd ~/build/ysoftdevs/wapifuzz/parser/ && dotnet restore && dotnet test
-  - cd ~/build/ysoftdevs/wapifuzz/fuzzer/src/ && python3 -m unittest unit_tests.fuzzing_json_decoder_tests
+  - cd ~/build/ysoftdevs/wapifuzz/fuzzer/ && python3 -m unittest unit_tests.fuzzing_json_decoder_tests
-  - cd ~/build/ysoftdevs/wapifuzz/fuzzer/src/ && python3 -m unittest unit_tests.json_schema_parser_tests
+  - cd ~/build/ysoftdevs/wapifuzz/fuzzer/ && python3 -m unittest unit_tests.json_schema_parser_tests
-  - cd ~/build/ysoftdevs/wapifuzz/fuzzer/src/ && python3 -m unittest unit_tests.request_build_helper_tests
+  - cd ~/build/ysoftdevs/wapifuzz/fuzzer/ && python3 -m unittest unit_tests.request_build_helper_tests
   - cd ~/build/ysoftdevs/wapifuzz/tests/ && chmod +x run_tests.sh && travis_wait ./run_tests.sh

fuzzer/payloads/payloads_loader.py

@@ -40,7 +40,7 @@ class PayloadsLoader:
 
 def load_default_payloads(hostname: str):
     loader = PayloadsLoader(hostname)
-    base_path = './fuzzer/src/payloads/lists/'
+    base_path = './fuzzer/payloads/lists/'
     for root, directories, files in os.walk(base_path):
         for file in files:
             if file.endswith('.txt'):

run.ps1

@@ -67,7 +67,7 @@ Write-Host "Installing specific dependencies"
 pip install git+https://github.com/jtpereyda/boofuzz.git
 pip install junit-xml
 Write-Host "Starting fuzz testing"
-python ./fuzzer/src/wapifuzz.py ${config} ${API_REQUESTS_JSON} ${JUNIT_TEST_REPORT} ${payloads} > $FUZZER_LOG
+python ./fuzzer/wapifuzz.py ${config} ${API_REQUESTS_JSON} ${JUNIT_TEST_REPORT} ${payloads} > $FUZZER_LOG
 $FUZZER_ERROR_CODE=$LASTEXITCODE
 if ($FUZZER_ERROR_CODE -eq 2)
 {

run.sh

@@ -77,7 +77,7 @@ ${PYTHON3_BIN} -m virtualenv env
 echo "Started fuzzing"
 . ./env/bin/activate ; \
 pip install --upgrade pip ; pip install git+https://github.com/jtpereyda/boofuzz.git ; pip install junit-xml ; \
-python fuzzer/src/wapifuzz.py ${WAPIFUZZ_CONFIG} ${API_REQUESTS_JSON} ${JUNIT_TEST_REPORT} ${CUSTOM_PAYLOADS_FILE} > ${FUZZER_LOG}
+python fuzzer/wapifuzz.py ${WAPIFUZZ_CONFIG} ${API_REQUESTS_JSON} ${JUNIT_TEST_REPORT} ${CUSTOM_PAYLOADS_FILE} > ${FUZZER_LOG}
 FUZZER_ERROR_CODE=$?
 if [ "$FUZZER_ERROR_CODE" -eq "2" ]; then
    echo "Fuzzing failed. Trying to generate HTML result of procceeded test cases.";