Loading src/proto-banner1.c +9 −1 Changes for src/proto-banner1.c: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ #include "proto-ssh.h" #include "proto-ftp.h" #include "proto-smtp.h" #include "proto-imap4.h" #include "proto-pop3.h" #include "proto-vnc.h" #include "masscan-app.h" Loading Loading @@ -155,10 +156,17 @@ banner1_parse( banout, more); break; case PROTO_IMAP4: banner_imap4.parse(banner1, banner1->http_fields, tcb_state, px, length, banout, more); break; case PROTO_SSH1: case PROTO_SSH2: case PROTO_IMAP4: /* generic text-based parser * TODO: in future, need to split these into separate protocols, * especially when binary parsing is added to SSH */ Loading src/proto-imap4.c +201 Changes for src/proto-imap4.c: 201 added lines, 0 removed lines. Original line number Diff line number Diff line /* imap4 banner checker */ #include "proto-imap4.h" #include "proto-banner1.h" #include "unusedparm.h" #include "masscan-app.h" #include "proto-interactive.h" #include "proto-ssl.h" #include <ctype.h> #include <string.h> /*************************************************************************** ***************************************************************************/ static void imap4_parse( const struct Banner1 *banner1, void *banner1_private, struct ProtocolState *pstate, const unsigned char *px, size_t length, struct BannerOutput *banout, struct InteractiveData *more) { unsigned state = pstate->state; unsigned i; UNUSEDPARM(banner1_private); UNUSEDPARM(banner1); for (i=0; i<length; i++) { if (px[i] == '\r') continue; printf("\n%u-%c\n", state, px[i]); switch (state) { case 0: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '*') state++; else state = STATE_DONE; break; case 1: if (px[i] == ' ') { banout_append_char(banout, PROTO_IMAP4, px[i]); continue; } else state++; /* fall through */ case 2: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == 'O') state++; else state = STATE_DONE; break; case 3: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == 'K') state++; else state = STATE_DONE; break; case 4: if (px[i] == ' ') { banout_append_char(banout, PROTO_IMAP4, px[i]); state++; break; } else if (px[i] != '\n') { banout_append_char(banout, PROTO_IMAP4, px[i]); /* no transition */ break; } else { state++; /* fall through */ } case 5: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '\n') { tcp_transmit(more, "a001 CAPABILITY\r\n", 17); state = 100; } break; case 100: case 300: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '*') state += 100; else if (px[i] == 'a') state++; else state = STATE_DONE; break; case 101: case 301: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '0') state++; else state = STATE_DONE; break; case 102: case 302: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '0') state++; else state = STATE_DONE; break; case 103: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '1') state++; else state = STATE_DONE; break; case 303: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '2') state++; else state = STATE_DONE; break; case 104: case 304: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == ' ') state++; else state = STATE_DONE; break; case 105: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '\n') { tcp_transmit(more, "a002 STARTTLS\r\n", 15); state = 300; } break; case 200: case 400: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '\n') state -= 100; break; case 305: if (px[i] == '\n') { /* change the state here to SSL */ unsigned port = pstate->port; memset(pstate, 0, sizeof(*pstate)); pstate->app_proto = PROTO_SSL3; pstate->is_sent_sslhello = 1; pstate->port = port; state = 0; more->payload = banner_ssl.hello; more->length = banner_ssl.hello_length; break; } break; default: i = (unsigned)length; break; } } pstate->state = state; } /*************************************************************************** ***************************************************************************/ static void * imap4_init(struct Banner1 *banner1) { UNUSEDPARM(banner1); return 0; } /*************************************************************************** ***************************************************************************/ static int imap4_selftest(void) { return 0; } /*************************************************************************** ***************************************************************************/ const struct ProtocolParserStream banner_imap4 = { "imap4", 21, 0, 0, 0, imap4_selftest, imap4_init, imap4_parse, }; src/proto-imap4.h +7 Changes for src/proto-imap4.h: 7 added lines, 0 removed lines. Original line number Diff line number Diff line #ifndef PROTO_IMAP4_H #define PROTO_IMAP4_H #include "proto-banner1.h" extern const struct ProtocolParserStream banner_imap4; #endif xcode4/masscan.xcodeproj/project.pbxproj +6 Changes for xcode4/masscan.xcodeproj/project.pbxproj: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ 11420DDB19A84A9F00DB5BFE /* proto-smtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DDA19A84A9E00DB5BFE /* proto-smtp.c */; }; 11420DDE19A8FDE300DB5BFE /* proto-pop3.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */; }; 11420DE019A90CB300DB5BFE /* proto-interactive.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DDF19A90CB300DB5BFE /* proto-interactive.c */; }; 11420DE319A9363B00DB5BFE /* proto-imap4.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DE219A9363A00DB5BFE /* proto-imap4.c */; }; 115C0CAB18035BC5004E6CD7 /* proto-netbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA518035BC5004E6CD7 /* proto-netbios.c */; }; 115C0CAC18035BC5004E6CD7 /* proto-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA718035BC5004E6CD7 /* proto-ssl.c */; }; 11623F6A191E0DB00075EEE6 /* out-certs.c in Sources */ = {isa = PBXBuildFile; fileRef = 11623F69191E0DB00075EEE6 /* out-certs.c */; }; Loading Loading @@ -110,6 +111,8 @@ 11420DDC19A8F2D200DB5BFE /* proto-pop3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "proto-pop3.h"; sourceTree = "<group>"; }; 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-pop3.c"; sourceTree = "<group>"; }; 11420DDF19A90CB300DB5BFE /* proto-interactive.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-interactive.c"; sourceTree = "<group>"; }; 11420DE119A9361500DB5BFE /* proto-imap4.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "proto-imap4.h"; sourceTree = "<group>"; }; 11420DE219A9363A00DB5BFE /* proto-imap4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-imap4.c"; sourceTree = "<group>"; }; 115C0CA318035BC5004E6CD7 /* out-record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "out-record.h"; sourceTree = "<group>"; }; 115C0CA418035BC5004E6CD7 /* proto-dns-parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-dns-parse.h"; sourceTree = "<group>"; }; 115C0CA518035BC5004E6CD7 /* proto-netbios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-netbios.c"; sourceTree = "<group>"; }; Loading Loading @@ -420,6 +423,8 @@ 11420DDC19A8F2D200DB5BFE /* proto-pop3.h */, 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */, 11420DDF19A90CB300DB5BFE /* proto-interactive.c */, 11420DE119A9361500DB5BFE /* proto-imap4.h */, 11420DE219A9363A00DB5BFE /* proto-imap4.c */, ); name = src; path = ../src; Loading Loading @@ -552,6 +557,7 @@ 11420DDB19A84A9F00DB5BFE /* proto-smtp.c in Sources */, 11420DDE19A8FDE300DB5BFE /* proto-pop3.c in Sources */, 11420DE019A90CB300DB5BFE /* proto-interactive.c in Sources */, 11420DE319A9363B00DB5BFE /* proto-imap4.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Loading Loading
src/proto-banner1.c +9 −1 Changes for src/proto-banner1.c: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ #include "proto-ssh.h" #include "proto-ftp.h" #include "proto-smtp.h" #include "proto-imap4.h" #include "proto-pop3.h" #include "proto-vnc.h" #include "masscan-app.h" Loading Loading @@ -155,10 +156,17 @@ banner1_parse( banout, more); break; case PROTO_IMAP4: banner_imap4.parse(banner1, banner1->http_fields, tcb_state, px, length, banout, more); break; case PROTO_SSH1: case PROTO_SSH2: case PROTO_IMAP4: /* generic text-based parser * TODO: in future, need to split these into separate protocols, * especially when binary parsing is added to SSH */ Loading
src/proto-imap4.c +201 Changes for src/proto-imap4.c: 201 added lines, 0 removed lines. Original line number Diff line number Diff line /* imap4 banner checker */ #include "proto-imap4.h" #include "proto-banner1.h" #include "unusedparm.h" #include "masscan-app.h" #include "proto-interactive.h" #include "proto-ssl.h" #include <ctype.h> #include <string.h> /*************************************************************************** ***************************************************************************/ static void imap4_parse( const struct Banner1 *banner1, void *banner1_private, struct ProtocolState *pstate, const unsigned char *px, size_t length, struct BannerOutput *banout, struct InteractiveData *more) { unsigned state = pstate->state; unsigned i; UNUSEDPARM(banner1_private); UNUSEDPARM(banner1); for (i=0; i<length; i++) { if (px[i] == '\r') continue; printf("\n%u-%c\n", state, px[i]); switch (state) { case 0: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '*') state++; else state = STATE_DONE; break; case 1: if (px[i] == ' ') { banout_append_char(banout, PROTO_IMAP4, px[i]); continue; } else state++; /* fall through */ case 2: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == 'O') state++; else state = STATE_DONE; break; case 3: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == 'K') state++; else state = STATE_DONE; break; case 4: if (px[i] == ' ') { banout_append_char(banout, PROTO_IMAP4, px[i]); state++; break; } else if (px[i] != '\n') { banout_append_char(banout, PROTO_IMAP4, px[i]); /* no transition */ break; } else { state++; /* fall through */ } case 5: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '\n') { tcp_transmit(more, "a001 CAPABILITY\r\n", 17); state = 100; } break; case 100: case 300: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '*') state += 100; else if (px[i] == 'a') state++; else state = STATE_DONE; break; case 101: case 301: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '0') state++; else state = STATE_DONE; break; case 102: case 302: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '0') state++; else state = STATE_DONE; break; case 103: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '1') state++; else state = STATE_DONE; break; case 303: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '2') state++; else state = STATE_DONE; break; case 104: case 304: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == ' ') state++; else state = STATE_DONE; break; case 105: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '\n') { tcp_transmit(more, "a002 STARTTLS\r\n", 15); state = 300; } break; case 200: case 400: banout_append_char(banout, PROTO_IMAP4, px[i]); if (px[i] == '\n') state -= 100; break; case 305: if (px[i] == '\n') { /* change the state here to SSL */ unsigned port = pstate->port; memset(pstate, 0, sizeof(*pstate)); pstate->app_proto = PROTO_SSL3; pstate->is_sent_sslhello = 1; pstate->port = port; state = 0; more->payload = banner_ssl.hello; more->length = banner_ssl.hello_length; break; } break; default: i = (unsigned)length; break; } } pstate->state = state; } /*************************************************************************** ***************************************************************************/ static void * imap4_init(struct Banner1 *banner1) { UNUSEDPARM(banner1); return 0; } /*************************************************************************** ***************************************************************************/ static int imap4_selftest(void) { return 0; } /*************************************************************************** ***************************************************************************/ const struct ProtocolParserStream banner_imap4 = { "imap4", 21, 0, 0, 0, imap4_selftest, imap4_init, imap4_parse, };
src/proto-imap4.h +7 Changes for src/proto-imap4.h: 7 added lines, 0 removed lines. Original line number Diff line number Diff line #ifndef PROTO_IMAP4_H #define PROTO_IMAP4_H #include "proto-banner1.h" extern const struct ProtocolParserStream banner_imap4; #endif
xcode4/masscan.xcodeproj/project.pbxproj +6 Changes for xcode4/masscan.xcodeproj/project.pbxproj: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ 11420DDB19A84A9F00DB5BFE /* proto-smtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DDA19A84A9E00DB5BFE /* proto-smtp.c */; }; 11420DDE19A8FDE300DB5BFE /* proto-pop3.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */; }; 11420DE019A90CB300DB5BFE /* proto-interactive.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DDF19A90CB300DB5BFE /* proto-interactive.c */; }; 11420DE319A9363B00DB5BFE /* proto-imap4.c in Sources */ = {isa = PBXBuildFile; fileRef = 11420DE219A9363A00DB5BFE /* proto-imap4.c */; }; 115C0CAB18035BC5004E6CD7 /* proto-netbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA518035BC5004E6CD7 /* proto-netbios.c */; }; 115C0CAC18035BC5004E6CD7 /* proto-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA718035BC5004E6CD7 /* proto-ssl.c */; }; 11623F6A191E0DB00075EEE6 /* out-certs.c in Sources */ = {isa = PBXBuildFile; fileRef = 11623F69191E0DB00075EEE6 /* out-certs.c */; }; Loading Loading @@ -110,6 +111,8 @@ 11420DDC19A8F2D200DB5BFE /* proto-pop3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "proto-pop3.h"; sourceTree = "<group>"; }; 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-pop3.c"; sourceTree = "<group>"; }; 11420DDF19A90CB300DB5BFE /* proto-interactive.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-interactive.c"; sourceTree = "<group>"; }; 11420DE119A9361500DB5BFE /* proto-imap4.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "proto-imap4.h"; sourceTree = "<group>"; }; 11420DE219A9363A00DB5BFE /* proto-imap4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-imap4.c"; sourceTree = "<group>"; }; 115C0CA318035BC5004E6CD7 /* out-record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "out-record.h"; sourceTree = "<group>"; }; 115C0CA418035BC5004E6CD7 /* proto-dns-parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-dns-parse.h"; sourceTree = "<group>"; }; 115C0CA518035BC5004E6CD7 /* proto-netbios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-netbios.c"; sourceTree = "<group>"; }; Loading Loading @@ -420,6 +423,8 @@ 11420DDC19A8F2D200DB5BFE /* proto-pop3.h */, 11420DDD19A8FDE300DB5BFE /* proto-pop3.c */, 11420DDF19A90CB300DB5BFE /* proto-interactive.c */, 11420DE119A9361500DB5BFE /* proto-imap4.h */, 11420DE219A9363A00DB5BFE /* proto-imap4.c */, ); name = src; path = ../src; Loading Loading @@ -552,6 +557,7 @@ 11420DDB19A84A9F00DB5BFE /* proto-smtp.c in Sources */, 11420DDE19A8FDE300DB5BFE /* proto-pop3.c in Sources */, 11420DE019A90CB300DB5BFE /* proto-interactive.c in Sources */, 11420DE319A9363B00DB5BFE /* proto-imap4.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Loading