From cadba90a5aa89668378b7fc2cc710ab935e30f16 Mon Sep 17 00:00:00 2001 From: forgedhallpass <13679401+forgedhallpass@users.noreply.github.com> Date: Fri, 10 Jun 2022 13:33:16 +0300 Subject: [PATCH] test: extended the DSL helper integration test cases --- integration_tests/http/dsl-functions.yaml | 127 +++++++++++----------- v2/cmd/integration-test/http.go | 2 +- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/integration_tests/http/dsl-functions.yaml b/integration_tests/http/dsl-functions.yaml index 95b5dfe10..d2babf39d 100644 --- a/integration_tests/http/dsl-functions.yaml +++ b/integration_tests/http/dsl-functions.yaml @@ -14,67 +14,72 @@ requests: 02: {{base64(1234)}} 03: {{base64_decode("SGVsbG8=")}} 04: {{base64_py("Hello")}} - 05: {{concat("Hello", "world")}} - 06: {{contains("Hello", "lo")}} - 07: {{date_time("%Y-%M-%D")}} - 08: {{date_time("%Y-%M-%D", unix_time())}} - 09: {{date_time("%H-%m")}} - 10: {{date_time("02-01-2006 15:04")}} - 11: {{date_time("02-01-2006 15:04", unix_time())}} - 12: {{generate_java_gadget("commons-collections3.1", "wget http://{{interactsh-url}}", "base64")}} - 13: {{gzip("Hello")}} - 14: {{hex_decode("6161")}} - 15: {{hex_encode("aa")}} - 16: {{hmac("sha1", "test", "scrt")}} - 17: {{hmac("sha256", "test", "scrt")}} - 18: {{html_escape("test")}} - 19: {{html_unescape("<body>test</body>")}} - 20: {{join("_", "hello", "world")}} - 21: {{len("Hello")}} - 22: {{len(5555)}} - 23: {{md5("Hello")}} - 24: {{md5(1234)}} - 25: {{mmh3("Hello")}} - 26: {{print_debug(1+2, "Hello")}} - 27: {{rand_base(5, "abc")}} - 28: {{rand_base(5, "")}} - 29: {{rand_base(5)}} - 30: {{rand_char("abc")}} - 31: {{rand_char("")}} - 32: {{rand_char()}} - 33: {{rand_int(1, 10)}} - 34: {{rand_int(10)}} - 35: {{rand_int()}} - 36: {{rand_ip("192.168.0.0/24")}} - 37: {{rand_ip("2002:c0a8::/24")}} - 38: {{rand_ip("192.168.0.0/24","10.0.100.0/24")}} - 39: {{rand_text_alpha(10, "abc")}} - 40: {{rand_text_alpha(10, "")}} - 41: {{rand_text_alpha(10)}} - 42: {{rand_text_alphanumeric(10, "ab12")}} - 43: {{rand_text_alphanumeric(10)}} - 44: {{rand_text_numeric(10, 123)}} - 45: {{rand_text_numeric(10)}} - 46: {{regex("H([a-z]+)o", "Hello")}} - 47: {{remove_bad_chars("abcd", "bc")}} - 48: {{repeat("a", 5)}} - 49: {{replace("Hello", "He", "Ha")}} - 50: {{replace_regex("He123llo", "(\\d+)", "")}} - 51: {{reverse("abc")}} - 52: {{sha1("Hello")}} - 53: {{sha256("Hello")}} - 54: {{to_lower("HELLO")}} - 55: {{to_upper("hello")}} - 56: {{trim("aaaHelloddd", "ad")}} - 57: {{trim_left("aaaHelloddd", "ad")}} - 58: {{trim_prefix("aaHelloaa", "aa")}} - 59: {{trim_right("aaaHelloddd", "ad")}} - 60: {{trim_space(" Hello ")}} - 61: {{trim_suffix("aaHelloaa", "aa")}} - 62: {{unix_time(10)}} - 63: {{url_decode("https:%2F%2Fprojectdiscovery.io%3Ftest=1")}} - 64: {{url_encode("https://projectdiscovery.io/test?a=1")}} - 65: {{wait_for(1)}} + 05: {{compare_versions('v1.0.0', '>v0.0.1', 'test")}} + 22: {{html_unescape("<body>test</body>")}} + 23: {{join("_", "hello", "world")}} + 24: {{len("Hello")}} + 25: {{len(5555)}} + 26: {{md5("Hello")}} + 27: {{md5(1234)}} + 28: {{mmh3("Hello")}} + 29: {{print_debug(1+2, "Hello")}} + 30: {{rand_base(5, "abc")}} + 31: {{rand_base(5, "")}} + 32: {{rand_base(5)}} + 33: {{rand_char("abc")}} + 34: {{rand_char("")}} + 35: {{rand_char()}} + 36: {{rand_int(1, 10)}} + 37: {{rand_int(10)}} + 38: {{rand_int()}} + 39: {{rand_ip("192.168.0.0/24")}} + 40: {{rand_ip("2002:c0a8::/24")}} + 41: {{rand_ip("192.168.0.0/24","10.0.100.0/24")}} + 42: {{rand_text_alpha(10, "abc")}} + 43: {{rand_text_alpha(10, "")}} + 44: {{rand_text_alpha(10)}} + 45: {{rand_text_alphanumeric(10, "ab12")}} + 46: {{rand_text_alphanumeric(10)}} + 47: {{rand_text_numeric(10, 123)}} + 48: {{rand_text_numeric(10)}} + 49: {{regex("H([a-z]+)o", "Hello")}} + 50: {{remove_bad_chars("abcd", "bc")}} + 51: {{repeat("a", 5)}} + 52: {{replace("Hello", "He", "Ha")}} + 53: {{replace_regex("He123llo", "(\\d+)", "")}} + 54: {{reverse("abc")}} + 55: {{sha1("Hello")}} + 56: {{sha256("Hello")}} + 57: {{to_lower("HELLO")}} + 58: {{to_upper("hello")}} + 59: {{trim("aaaHelloddd", "ad")}} + 60: {{trim_left("aaaHelloddd", "ad")}} + 61: {{trim_prefix("aaHelloaa", "aa")}} + 62: {{trim_right("aaaHelloddd", "ad")}} + 63: {{trim_space(" Hello ")}} + 64: {{trim_suffix("aaHelloaa", "aa")}} + 65: {{unix_time(10)}} + 66: {{url_decode("https:%2F%2Fprojectdiscovery.io%3Ftest=1")}} + 67: {{url_encode("https://projectdiscovery.io/test?a=1")}} + 68: {{wait_for(1)}} + 69: {{zlib("Hello")}} + 70: {{zlib_decode(hex_decode("789cf248cdc9c907040000ffff058c01f5"))}} extractors: - type: regex diff --git a/v2/cmd/integration-test/http.go b/v2/cmd/integration-test/http.go index e27915b1d..15f925039 100644 --- a/v2/cmd/integration-test/http.go +++ b/v2/cmd/integration-test/http.go @@ -256,7 +256,7 @@ func (h *httpDSLFunctions) Execute(filePath string) error { } totalExtracted := strings.Split(submatch[1], ",") - numberOfDslFunctions := 65 + numberOfDslFunctions := 70 if len(totalExtracted) != numberOfDslFunctions { return errors.New("incorrect number of results") }