Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ammar92 committed Mar 26, 2024
2 parents 3f54f6e + 0a1c870 commit d8dcc5a
Show file tree
Hide file tree
Showing 2 changed files with 154 additions and 157 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"id": "kat_webpage_analysis_wappalyzer_normalize",
"consumes": [
"openkat-http/response"
],
"produces": [
"Software",
"SoftwareInstance"
]
"id": "kat_webpage_analysis_wappalyzer_normalize",
"consumes": [
"openkat-http/response"
],
"produces": [
"Software",
"SoftwareInstance"
]
}
295 changes: 146 additions & 149 deletions boefjes/boefjes/plugins/kat_webpage_analysis/boefje.json
Original file line number Diff line number Diff line change
@@ -1,151 +1,148 @@
{
"id": "webpage-analysis",
"name": "WebpageAnalysis",
"description": "Downloads a resource and uses several different normalizers to analyze",
"consumes": [
"HTTPResource"
],
"produces": [
"openkat-http/full",
"openkat-http/headers",
"openkat-http/body",
"application/javascript",
"application/javascript",
"application/json",
"application/manifest+json",
"application/msword",
"application/msword",
"application/msword",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/oda",
"application/pdf",
"application/pkcs7-mime",
"application/postscript",
"application/postscript",
"application/postscript",
"application/vnd.apple.mpegurl",
"application/vnd.apple.mpegurl",
"application/vnd.ms-excel",
"application/vnd.ms-excel",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/wasm",
"application/x-bcpio",
"application/x-cpio",
"application/x-csh",
"application/x-dvi",
"application/x-gtar",
"application/x-hdf",
"application/x-hdf5",
"application/x-latex",
"application/x-mif",
"application/x-netcdf",
"application/x-netcdf",
"application/x-pkcs12",
"application/x-pkcs12",
"application/x-pn-realaudio",
"application/x-python-code",
"application/x-python-code",
"application/x-sh",
"application/x-shar",
"application/x-shockwave-flash",
"application/x-sv4cpio",
"application/x-sv4crc",
"application/x-tar",
"application/x-tcl",
"application/x-tex",
"application/x-texinfo",
"application/x-texinfo",
"application/x-troff",
"application/x-troff",
"application/x-troff",
"application/x-troff-man",
"application/x-troff-me",
"application/x-troff-ms",
"application/x-ustar",
"application/x-wais-source",
"application/xml",
"application/xml",
"application/xml",
"application/xml",
"application/zip",

"audio/basic",
"audio/basic",
"audio/mpeg",
"audio/mpeg",
"audio/x-aiff",
"audio/x-aiff",
"audio/x-aiff",
"audio/x-pn-realaudio",
"audio/x-wav",

"image/x-ms-bmp",
"image/gif",
"image/ief",
"image/jpeg",
"image/jpeg",
"image/jpeg",
"image/png",
"image/svg+xml",
"image/tiff",
"image/tiff",
"image/vnd.microsoft.icon",
"image/x-cmu-raster",
"image/x-portable-anymap",
"image/x-portable-bitmap",
"image/x-portable-graymap",
"image/x-portable-pixmap",
"image/x-rgb",
"image/x-xbitmap",
"image/x-xpixmap",
"image/x-xwindowdump",

"message/rfc822",
"message/rfc822",
"message/rfc822",
"message/rfc822",

"text/css",
"text/csv",
"text/html",
"text/html",
"text/plain",
"text/plain",
"text/plain",
"text/plain",
"text/plain",
"text/plain",
"text/richtext",
"text/tab-separated-values",
"text/x-python",
"text/x-setext",
"text/x-sgml",
"text/x-sgml",
"text/x-vcard",
"text/xml",

"video/mp4",
"video/mpeg",
"video/mpeg",
"video/mpeg",
"video/mpeg",
"video/mpeg",
"video/quicktime",
"video/quicktime",
"video/webm",
"video/x-msvideo",
"video/x-sgi-movie"
],
"environment_keys": ["USERAGENT"],
"scan_level": 2
"id": "webpage-analysis",
"name": "WebpageAnalysis",
"description": "Downloads a resource and uses several different normalizers to analyze",
"consumes": [
"HTTPResource"
],
"produces": [
"openkat-http/response",
"openkat-http/headers",
"openkat-http/body",
"application/javascript",
"application/javascript",
"application/json",
"application/manifest+json",
"application/msword",
"application/msword",
"application/msword",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/octet-stream",
"application/oda",
"application/pdf",
"application/pkcs7-mime",
"application/postscript",
"application/postscript",
"application/postscript",
"application/vnd.apple.mpegurl",
"application/vnd.apple.mpegurl",
"application/vnd.ms-excel",
"application/vnd.ms-excel",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/vnd.ms-powerpoint",
"application/wasm",
"application/x-bcpio",
"application/x-cpio",
"application/x-csh",
"application/x-dvi",
"application/x-gtar",
"application/x-hdf",
"application/x-hdf5",
"application/x-latex",
"application/x-mif",
"application/x-netcdf",
"application/x-netcdf",
"application/x-pkcs12",
"application/x-pkcs12",
"application/x-pn-realaudio",
"application/x-python-code",
"application/x-python-code",
"application/x-sh",
"application/x-shar",
"application/x-shockwave-flash",
"application/x-sv4cpio",
"application/x-sv4crc",
"application/x-tar",
"application/x-tcl",
"application/x-tex",
"application/x-texinfo",
"application/x-texinfo",
"application/x-troff",
"application/x-troff",
"application/x-troff",
"application/x-troff-man",
"application/x-troff-me",
"application/x-troff-ms",
"application/x-ustar",
"application/x-wais-source",
"application/xml",
"application/xml",
"application/xml",
"application/xml",
"application/zip",
"audio/basic",
"audio/basic",
"audio/mpeg",
"audio/mpeg",
"audio/x-aiff",
"audio/x-aiff",
"audio/x-aiff",
"audio/x-pn-realaudio",
"audio/x-wav",
"image/x-ms-bmp",
"image/gif",
"image/ief",
"image/jpeg",
"image/jpeg",
"image/jpeg",
"image/png",
"image/svg+xml",
"image/tiff",
"image/tiff",
"image/vnd.microsoft.icon",
"image/x-cmu-raster",
"image/x-portable-anymap",
"image/x-portable-bitmap",
"image/x-portable-graymap",
"image/x-portable-pixmap",
"image/x-rgb",
"image/x-xbitmap",
"image/x-xpixmap",
"image/x-xwindowdump",
"message/rfc822",
"message/rfc822",
"message/rfc822",
"message/rfc822",
"text/css",
"text/csv",
"text/html",
"text/html",
"text/plain",
"text/plain",
"text/plain",
"text/plain",
"text/plain",
"text/plain",
"text/richtext",
"text/tab-separated-values",
"text/x-python",
"text/x-setext",
"text/x-sgml",
"text/x-sgml",
"text/x-vcard",
"text/xml",
"video/mp4",
"video/mpeg",
"video/mpeg",
"video/mpeg",
"video/mpeg",
"video/mpeg",
"video/quicktime",
"video/quicktime",
"video/webm",
"video/x-msvideo",
"video/x-sgi-movie"
],
"environment_keys": [
"USERAGENT"
],
"scan_level": 2
}

0 comments on commit d8dcc5a

Please sign in to comment.