69 Commits

Author SHA1 Message Date
Josh Soref
4c1c5301b9
Spelling (#4008)
* spelling: addresses

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: asynchronous

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: basic

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: brute force

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: constant

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: disables

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: engine

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: every time

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: execution

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: false positives

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: from

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: further

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: github

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: gitlab

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: highlight

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: hygiene

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: ignore

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: input

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: item

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: itself

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: latestxxx

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: navigation

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: negative

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: nonexistent

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: occurred

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: override

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: overrides

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: payload

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: performed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: respective

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: retrieve

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: scanlist

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: separated

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: separator

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: severity

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: source

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: strategy

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: string

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: templates

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: terminal

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: timeout

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: trailing slash

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: trailing

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: websocket

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

---------

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-08-02 00:03:43 +05:30
Mzack9999
dfd4d5b855
Adding interact keepalive to reduce server-side id pruning (#3680)
* adding interact keepalive + improving init logic

* dep update

* go version update

* readme update

* version bump

* fixing invalid format

---------

Co-authored-by: Sandeep Singh <sandeep@projectdiscovery.io>
Co-authored-by: sandeep <8293321+ehsandeep@users.noreply.github.com>
2023-05-21 01:56:13 +05:30
Mzack9999
ea5f8a0638
Additional nil check on interactsh client (#3590) 2023-04-25 23:49:23 +05:30
Mzack9999
6f4b1ae48a
Replacing ccache with generic gcache (#3523)
* Replacing ccache with generic gcache

* fixing lint issues

* removing unecessary hashing + using errorutils

* making test more tolerant

* removing dead code + refactor

* removing redundant code

* removing race

* maint

* moving code

* adding more iterations

* note + typo

* temporary fixing stop-at-first-match with interact

* wrapping internal map with mux

* sort before running integration test

* fix deadlock in requestShouldStopAtFirstMatch

* add timeout to integration_test workflow

* attempting to remove outer lock

* adds interactsh protocol tests in integration_test

---------

Co-authored-by: Tarun Koyalwar <tarun@projectdiscovery.io>
2023-04-16 23:19:35 +05:30
Mzack9999
4c0d988a67 reworking interact mutex mechanism 2023-03-17 14:41:16 +01:00
Tarun Koyalwar
c3771e874d
fix data race in internal resultevent (#3432) 2023-03-16 23:20:38 +05:30
Ramana Reddy
c9634fae72
Issue 3350 matcher condition or not work (#3397)
* fix or condition match even interactsh includes as matcher-part (#3350)

* add integration test

* add new template to integration test

* matcher-condtion: test case for both conditions

* fix lint errors

* upgrade dependencies

---------

Co-authored-by: Tarun Koyalwar <tarun@projectdiscovery.io>
2023-03-15 20:45:44 +05:30
Sandeep Singh
ba7fcd08ff
Merge branch 'dev' into issue-2188-reporting-client 2023-02-20 15:26:16 +05:30
Mzack9999
d608ffaeb2
clear after stop (#3312)
* clear after stop

* fixing data races

* adding atomic cache

* fixing lint errors

* fixing imports
2023-02-13 16:46:41 +05:30
Mzack9999
d57aec5ec7 converting reporting client to interface 2023-02-07 09:45:49 +01:00
Mzack9999
7556416e5b
adding interactsh support to sni (#3276) 2023-02-07 14:02:10 +05:30
Mzack9999
34976029d3
removing most go routine leaks (#3073)
Co-authored-by: sandeep <8293321+ehsandeep@users.noreply.github.com>
2022-12-24 19:22:14 +05:30
Mzack9999
b942ddc6ad
Fixing map race condition (#2340) 2022-07-26 18:30:15 +05:30
Sami
6ca4374f91
sonar category: String literals should not be duplicated (#1944)
* sonar category: String literals should not be duplicated

* lint error fix

* better naming conventions for constants

* improved naming conventions and methods
2022-05-12 15:40:14 +05:30
mzack
6a52f4f709 updating go mods + logic 2022-05-06 12:59:16 +02:00
LuitelSamikshya
b0508ab194 alternative server if a server failed 2022-04-22 16:31:42 -05:00
Sajad
7c84590de7
add interact-url variable support for multiple placeholders #1698 (#1760)
* add interact-url variable support for multiple placeholders #1698

* add cache clearing for interactshURLs

* change interactsh-url regex

* fix interactshURLMarker regex

* use underscore(_) instead of dash(-) in interactshURLMarker

Co-authored-by: Mzack9999 <mzack9999@protonmail.com>
2022-04-07 12:53:38 +05:30
mzack
d2b5579303 Adding proxy support for internal standard HTTP requests 2022-03-09 12:31:12 +01:00
Ice3man
fb6ab39d65 Added interaction event highlighting support in debug mode 2022-02-25 23:11:56 +05:30
mzack
b3c61ee157 Differentiate between interact matchers and markers 2022-02-01 12:10:18 +01:00
Ice3man
8dfa9cee39
Added debug-req/resp support for interactsh interactions (#1491)
* Added debug-req/resp support for interactsh interactions

* Added format function for interact debug logs + misc fixes

* Added function for interact debug header

* Typo fix

* Enable debug logging for req/resp debug flag
2022-01-27 12:14:32 +05:30
sandeep
2221700b5b minor printing update 2022-01-13 18:17:34 +05:30
Ice3man
24326389a4
Added interactsh additional variables support (#1468)
* Added interactsh additional variables support

* Added support for interact server rotation

* Misc fixes to interact related modules

* Fixed a crash with interactsh

* Perform deduplication of output extract data before printing
2022-01-13 13:22:43 +05:30
Sajad
1faddf4723
change spm flag to work at template level instead of global for interactsh (#1466) 2022-01-09 17:34:31 +05:30
Sandeep Singh
ae2a485b1f
Merge branch 'dev' into feature-ldap 2022-01-01 13:01:08 +05:30
Sandeep Singh
c8e4c829e4
Merge pull request #1434 from projectdiscovery/issue-1287-interactsh-http-fallback
Adding support for automatic http fallback retry for interactsh
2021-12-30 18:38:25 +05:30
Sajad Parra
8799379e50 update hash function 2021-12-29 18:07:48 +05:30
mzack
d252c3d6ea Adding support for automatic http fallback retry for interactsh 2021-12-29 11:06:33 +01:00
Sajad Parra
5115c8b58c remove redundant contains function 2021-12-29 12:33:54 +05:30
Sajad Parra
e2b39e403c use ccache to store matchedTemplates with template-id+host hash as key 2021-12-29 12:28:18 +05:30
Sandeep Singh
8fbe451d54
Merge branch 'dev' into feature-ldap 2021-12-25 12:49:44 +05:30
Sajad Parra
0edb4274b1 add matchedTemplates to support template wise stop at first match 2021-12-22 21:42:21 +05:30
Sajad Parra
c0f9c1da70 interactsh stopAtFirstMatch intergration test 2021-12-21 15:24:16 +05:30
Sajad Parra
911045ae9a add stop at first match for interactsh matchers 2021-12-21 14:20:03 +05:30
Sandeep Singh
6a408fd6a8
feature: exposed interaction ip information to matchers/extractors (#1395) 2021-12-18 19:32:11 +05:30
Mike Brown
71040577ce add debug logging for interactsh feature-ldap 2021-12-15 22:52:55 -08:00
Sandeep Singh
fbb80610a8
Interactsh response missing in result fix (#1370)
Co-authored-by: Ice3man543 <nizamulrana@gmail.com>
2021-12-13 23:23:22 +05:30
sandeep
aae06e61bd fix: updating default interactsh server to use 2021-12-13 18:42:01 +05:30
Ice3man
1581c96e4e
Added matched-status flag + template-path and url to output (#1272)
* Added matched-status flag + template-path and url to output
2021-11-22 17:53:25 +05:30
Ice3man
50a816fce9
Fixed a crash with uninitialized interactsh client (#1251)
* Fixed a crash with uninitialized interactsh client
2021-11-16 20:02:39 +05:30
Ice3man543
213853c45d Merge from dev 2021-11-08 15:40:18 +05:30
Sajad Parra
4d8eaad0a3 add unit test for unique interactsh url #1068 2021-11-05 15:27:49 +05:30
Sajad Parra
41393fc09d unique payload per interactsh placeholder #1068 2021-11-04 17:13:47 +05:30
Ice3man543
5393cc4cd5 Adjusting packages for more API-type design 2021-10-29 03:19:43 +05:30
forgedhallpass
435ec5cd5d Do not show AND matcher information in the command line output if debug is not enabled #1081 2021-10-12 20:06:55 +03:00
sandeep
4f8fb0e516 Interactsh server update 2021-10-01 00:40:13 +05:30
forgedhallpass
9b45c31db8 Merge remote-tracking branch 'origin/dev' into code_smells 2021-09-16 15:49:51 +03:00
Ice3man543
259ccb118f fix: interactsh crash when not initialized 2021-09-15 18:15:22 +05:30
forgedhallpass
c762cc88aa Merge remote-tracking branch 'origin/dev' into code_smells 2021-09-10 15:33:09 +03:00
Ice3man543
c2c77de6f3 Use sync.Once for on-use initialization of interactsh 2021-09-10 00:32:05 +05:30