STRLCPY/LoggerPlusPlus

Better default table layout
Corey-Dean Arthur committed 5 years ago

aa6051b3

1 parent 4e1e8954

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

src/main/java/com/nccgroup/loggerplusplus/filter/parser/Filter.jj

		skipped 36 lines
37	37		}catch(Exception e){
38	38		throw new ParseException(e.getMessage());
39	39		}
40		-	VisitorData result = new SanityCheckVisitor().visit(node);
41		-	if(!result.isSuccess()) throw new ParseException(result.getErrorString());
	40	+	// VisitorData result = new SanityCheckVisitor().visit(node);
	41	+	// if(!result.isSuccess()) throw new ParseException(result.getErrorString());
42	42		return node;
43	43		}
44	44
		skipped 514 lines

■ ■ ■ ■ ■ ■

src/main/java/com/nccgroup/loggerplusplus/filter/parser/Filter.jjt

		skipped 32 lines
33	33		}catch(Exception e){
34	34		throw new ParseException(e.getMessage());
35	35		}
36		-	VisitorData result = new SanityCheckVisitor().visit(node);
37		-	if(!result.isSuccess()) throw new ParseException(result.getErrorString());
	36	+	// VisitorData result = new SanityCheckVisitor().visit(node);
	37	+	// if(!result.isSuccess()) throw new ParseException(result.getErrorString());
38	38		return node;
39	39		}
40	40
		skipped 435 lines

■ ■ ■ ■ ■ ■

src/main/java/com/nccgroup/loggerplusplus/filter/parser/FilterParser.java

		skipped 23 lines
24	24		}catch(Exception e){
25	25		throw new ParseException(e.getMessage());
26	26		}
27		-	VisitorData result = new SanityCheckVisitor().visit(node);
28		-	if(!result.isSuccess()) throw new ParseException(result.getErrorString());
	27	+	// VisitorData result = new SanityCheckVisitor().visit(node);
	28	+	// if(!result.isSuccess()) throw new ParseException(result.getErrorString());
29	29		return node;
30	30		}
31	31
		skipped 1366 lines

■ ■ ■ ■ ■ ■

src/main/java/com/nccgroup/loggerplusplus/logview/logtable/LogTableColumnModel.java

		skipped 74 lines
75	75		}
76	76		}
77	77
	78	+	public int getViewIndex(int modelIndex){
	79	+	return this.tableColumns.indexOf(this.allColumns.get(modelIndex));
	80	+	}
78	81
79	82		//TableModel gets the column from the model index, not the view index.
80	83		//If we dont do this all the groups are wrong!
		skipped 70 lines

■ ■ ■ ■ ■ ■

src/main/java/com/nccgroup/loggerplusplus/userinterface/LogTableModel.java

		skipped 1 lines
2	2
3	3		import burp.IHttpRequestResponse;
4	4		import com.nccgroup.loggerplusplus.logentry.LogEntry;
	5	+	import com.nccgroup.loggerplusplus.logentry.LogEntryField;
5	6		import com.nccgroup.loggerplusplus.logentry.LogManager;
6	7		import com.nccgroup.loggerplusplus.logview.logtable.LogTableColumn;
7	8		import com.nccgroup.loggerplusplus.logview.logtable.LogTableColumnModel;
		skipped 42 lines
50	51		@Override
51	52		public void setValueAt(Object value, int rowModelIndex, int columnModelIndex) {
52	53		LogEntry logEntry = entries.get(rowModelIndex);
53		-	fireTableCellUpdated(rowModelIndex, columnModelIndex);
	54	+	if(this.columnModel.getModelColumn(columnModelIndex).getIdentifier() == LogEntryField.COMMENT){
	55	+	logEntry.comment = (String) value;
	56	+	}
	57	+	fireTableCellUpdated(rowModelIndex, this.columnModel.getViewIndex(columnModelIndex));
54	58		}
55	59
56	60		@Override
		skipped 47 lines

■ ■ ■ ■ ■ ■

src/main/java/com/nccgroup/loggerplusplus/util/Globals.java

		skipped 60 lines
61	61		"\"foregroundColor\":{\"value\":-65536,\"falpha\":0.0},\"enabled\":true,\"modified\":false,\"shouldRetest\":true,\"priority\":1}}";
62	62		private static int colModelIndex = 0;
63	63		private static int colOrder = 0;
64		-	public static final String DEFAULT_LOG_TABLE_COLUMNS_JSON = "["
65		-	+ "{'id':" + NUMBER + ",'index':" + (colModelIndex++) + ",'name':'Number','defaultVisibleName':'#','visibleName':'#','preferredWidth':35,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Item index number','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
66		-	+ "{'id':" + COMPLETE + ",'index':" + (colModelIndex++) + ",'name':'Complete','defaultVisibleName':'Complete','visibleName':'Complete','preferredWidth':80,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Indicates if a response has been received.','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
67		-	+ "{'id':" + PROXY_TOOL + ",'index':" + (colModelIndex++) + ",'name':'Tool','defaultVisibleName':'Tool','visibleName':'Tool','preferredWidth':70,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Tool name','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
68		-	+ "{'id':" + METHOD + ",'index':" + (colModelIndex++) + ",'name':'Method','defaultVisibleName':'Method','visibleName':'Method','preferredWidth':65,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'HTTP request method','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
69		-	+ "{'id':" + HOST + ",'index':" + (colModelIndex++) + ",'name':'Host','defaultVisibleName':'Host','visibleName':'Host','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Host and Protocol (similar to the Proxy tab)','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
70		-	+ "{'id':" + PATH + ",'index':" + (colModelIndex++) + ",'name':'Path','defaultVisibleName':'Path','visibleName':'Path','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Request Path','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
71		-	+ "{'id':" + QUERY + ",'index':" + (colModelIndex++) + ",'name':'Query','defaultVisibleName':'Query','visibleName':'Query','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Query Parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
72		-	+ "{'id':" + HASPARAMS + ",'index':" + (colModelIndex++) + ",'name':'Params','defaultVisibleName':'Params','visibleName':'Params','preferredWidth':65,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Indicates whether or not the request has GET or POST parameter(s)','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
73		-	+ "{'id':" + URL + ",'index':" + (colModelIndex++) + ",'name':'Url','defaultVisibleName':'URL','visibleName':'URL','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Complete URL','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
74		-	+ "{'id':" + STATUS + ",'index':" + (colModelIndex++) + ",'name':'Status','defaultVisibleName':'Status','visibleName':'Status','preferredWidth':55,'type':'short','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Response status header','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
75		-	+ "{'id':" + RESPONSE_LENGTH + ",'index':" + (colModelIndex++) + ",'name':'ResponseLength','defaultVisibleName':'Response Length','visibleName':'Response Length','preferredWidth':100,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Length of response','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
76		-	+ "{'id':" + MIME_TYPE + ",'index':" + (colModelIndex++) + ",'name':'MimeType','defaultVisibleName':'MIME type','visibleName':'MIME type','preferredWidth':100,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Response content type using Burp API','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
77		-	+ "{'id':" + ISSSL + ",'index':" + (colModelIndex++) + ",'name':'IsSSL','defaultVisibleName':'SSL','visibleName':'SSL','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Indicates whether or not the HTTP protocol is HTTPS','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
78		-	+ "{'id':" + EXTENSION + ",'index':" + (colModelIndex++) + ",'name':'UrlExtension','defaultVisibleName':'Extension','visibleName':'Extension','preferredWidth':70,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Target page extension','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
79		-	+ "{'id':" + COMMENT + ",'index':" + (colModelIndex++) + ",'name':'Comment','defaultVisibleName':'Comment','visibleName':'Comment','preferredWidth':200,'type':'string','readonly':false,'order':" + colOrder++ + ",'visible':true,'description':'Editable comment','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
80		-	+ "{'id':" + NEW_COOKIES + ",'index':" + (colModelIndex++) + ",'name':'NewCookies','defaultVisibleName':'New Cookies','visibleName':'New Cookies','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows any new cookies in the response','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
81		-	+ "{'id':" + REQUEST_TIME + ",'index':" + (colModelIndex++) + ",'name':'RequestTime','defaultVisibleName':'Request Time','visibleName':'Request Time','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows date and time of making the request in this extension','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
82		-	+ "{'id':" + RESPONSE_TIME + ",'index':" + (colModelIndex++) + ",'name':'ResponseTime','defaultVisibleName':'Response Time','visibleName':'Response Time','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows date and time of receiving the response in this extension','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
83		-	+ "{'id':" + RTT + ",'index':" + (colModelIndex++) + ",'name':'RTT','defaultVisibleName':'RTT (ms)','visibleName':'RTT (ms)','preferredWidth':100,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows delay between making the request, and receiving the response. Note: Includes BurpSuite processing time','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
84		-	+ "{'id':" + LISTENER_INTERFACE + ",'index':" + (colModelIndex++) + ",'name':'ListenerInterface','defaultVisibleName':'Proxy Listener Interface','visibleName':'Proxy Listener Interface','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows the proxy listener interface for proxied requests','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
85		-	+ "{'id':" + CLIENT_IP + ",'index':" + (colModelIndex++) + ",'name':'ClientIP','defaultVisibleName':'Proxy Client IP','visibleName':'Proxy Client IP','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the client IP address when using the Proxy tab','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
86		-	+ "{'id':" + RESPONSE_CONTENT_TYPE + ",'index':" + (colModelIndex++) + ",'name':'ResponseContentType','defaultVisibleName':'Response Content-Type','visibleName':'Response Content-Type','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the content-type header in the response','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
87		-	+ "{'id':" + INFERRED_TYPE + ",'index':" + (colModelIndex++) + ",'name':'InferredType','defaultVisibleName':'Inferred Type','visibleName':'Inferred Type','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the content type which was inferred by Burp','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
88		-	+ "{'id':" + HASGETPARAM + ",'index':" + (colModelIndex++) + ",'name':'HasQueryStringParam','defaultVisibleName':'QueryString?','visibleName':'QueryString?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request has any querystring parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
89		-	+ "{'id':" + HASPOSTPARAM + ",'index':" + (colModelIndex++) + ",'name':'HasBodyParam','defaultVisibleName':'Body Params?','visibleName':'Body Params?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request contains any POST parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
90		-	+ "{'id':" + HASCOOKIEPARAM + ",'index':" + (colModelIndex++) + ",'name':'HasCookieParam','defaultVisibleName':'Sent Cookie?','visibleName':'Sent Cookie?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request has any Cookie parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
91		-	+ "{'id':" + SENTCOOKIES + ",'index':" + (colModelIndex++) + ",'name':'SentCookies','defaultVisibleName':'Sent Cookies','visibleName':'Sent Cookies','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the cookies which was sent in the request','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
92		-	+ "{'id':" + USES_COOKIE_JAR_PROXY + ",'index':" + (colModelIndex++) + ",'name':'UsesCookieJar','defaultVisibleName':'Contains cookie jar?','visibleName':'Contains cookie jar?','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Compares the cookies with the cookie jar ones to see if any of them in use','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
93		-	+ "{'id':" + PROTOCOL + ",'index':" + (colModelIndex++) + ",'name':'Protocol','defaultVisibleName':'Protocol','visibleName':'Protocol','preferredWidth':80,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request protocol','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
94		-	+ "{'id':" + HOSTNAME + ",'index':" + (colModelIndex++) + ",'name':'Hostname','defaultVisibleName':'Host Name','visibleName':'Host Name','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request host name','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
95		-	+ "{'id':" + PORT + ",'index':" + (colModelIndex++) + ",'name':'TargetPort','defaultVisibleName':'Port','visibleName':'Port','preferredWidth':50,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the target port number','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
96		-	+ "{'id':" + REQUEST_CONTENT_TYPE + ",'index':" + (colModelIndex++) + ",'name':'RequestContentType','defaultVisibleName':'Request Content Type','visibleName':'Request Type','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request content-type header','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
97		-	+ "{'id':" + REFERRER + ",'index':" + (colModelIndex++) + ",'name':'Referrer','defaultVisibleName':'Referrer','visibleName':'Referrer','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the referer header','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
98		-	+ "{'id':" + REQUEST_LENGTH + ",'index':" + (colModelIndex++) + ",'name':'RequestLength','defaultVisibleName':'Request Length','visibleName':'Request Length','preferredWidth':150,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request body length','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
99		-	+ "{'id':" + HAS_SET_COOKIES + ",'index':" + (colModelIndex++) + ",'name':'HasSetCookies','defaultVisibleName':'Set-Cookie?','visibleName':'Set-Cookie?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the response contains the set-cookie header','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
100		-	// + "{'id':" + REGEX1REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex1Req','defaultVisibleName':'Request RegEx 1','visibleName':'Request RegEx 1','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
101		-	// + "{'id':" + REGEX2REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex2Req','defaultVisibleName':'Request RegEx 2','visibleName':'Request RegEx 2','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
102		-	// + "{'id':" + REGEX3REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex3Req','defaultVisibleName':'Request RegEx 3','visibleName':'Request RegEx 3','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
103		-	// + "{'id':" + REGEX4REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex4Req','defaultVisibleName':'Request RegEx 4','visibleName':'Request RegEx 4','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
104		-	// + "{'id':" + REGEX5REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex5Req','defaultVisibleName':'Request RegEx 5','visibleName':'Request RegEx 5','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
105		-	// + "{'id':" + REGEX1RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex1Resp','defaultVisibleName':'Response RegEx 1','visibleName':'Response RegEx 1 - Title','preferredWidth':220,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'(?<=\\\\<title\\\\>)(.)+(?=\\\\<\\\\/title\\\\>)','regExCaseSensitive':false},"
106		-	// + "{'id':" + REGEX2RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex2Resp','defaultVisibleName':'Response RegEx 2','visibleName':'Response RegEx 2','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
107		-	// + "{'id':" + REGEX3RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex3Resp','defaultVisibleName':'Response RegEx 3','visibleName':'Response RegEx 3','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':true},"
108		-	// + "{'id':" + REGEX4RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex4Resp','defaultVisibleName':'Response RegEx 4','visibleName':'Response RegEx 4','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
109		-	// + "{'id':" + REGEX5RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex5Resp','defaultVisibleName':'Response RegEx 5','visibleName':'Response RegEx 5','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},"
110		-	+ "{'id':" + REQUEST_BODY + ",'index':" + (colModelIndex++) + ",'name':'Request','defaultVisibleName':'Request Body','visibleName':'Request Body','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Full Request Body','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
111		-	+ "{'id':" + REQUEST_HEADERS + ",'index':" + (colModelIndex++) + ",'name':'RequestHeaders','defaultVisibleName':'Request Headers','visibleName':'Request Headers','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Comma Delimited Request Headers','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
112		-	+ "{'id':" + RESPONSE_BODY + ",'index':" + (colModelIndex++) + ",'name':'Response','defaultVisibleName':'Response Body','visibleName':'Response Body','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Full Response Body','isRegEx':false,'regExString':'','regExCaseSensitive':false},"
113		-	+ "{'id':" + RESPONSE_HEADERS + ",'index':" + (colModelIndex++) + ",'name':'ResponseHeaders','defaultVisibleName':'Response Headers','visibleName':'Response Headers','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Comma Delimited Response Headers','isRegEx':false,'regExString':'','regExCaseSensitive':false}"
114		-	+ "]";
	64	+	public static final String DEFAULT_LOG_TABLE_COLUMNS_JSON = new StringBuilder().append("[")
	65	+	.append("{'id':" + NUMBER + ",'index':" + (colModelIndex++) + ",'name':'Number','defaultVisibleName':'#','visibleName':'#','preferredWidth':35,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Item index number','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	66	+	.append("{'id':" + COMPLETE + ",'index':" + (colModelIndex++) + ",'name':'Complete','defaultVisibleName':'Complete','visibleName':'Complete','preferredWidth':80,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Indicates if a response has been received.','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	67	+	.append("{'id':" + PROXY_TOOL + ",'index':" + (colModelIndex++) + ",'name':'Tool','defaultVisibleName':'Tool','visibleName':'Tool','preferredWidth':70,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Tool name','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	68	+	.append("{'id':" + METHOD + ",'index':" + (colModelIndex++) + ",'name':'Method','defaultVisibleName':'Method','visibleName':'Method','preferredWidth':65,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'HTTP request method','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	69	+	.append("{'id':" + HASPARAMS + ",'index':" + (colModelIndex++) + ",'name':'Has Params','defaultVisibleName':'Has Params','visibleName':'Has Params','preferredWidth':75,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request has GET or POST parameter(s)','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	70	+	.append("{'id':" + PROTOCOL + ",'index':" + (colModelIndex++) + ",'name':'Protocol','defaultVisibleName':'Protocol','visibleName':'Protocol','preferredWidth':80,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request protocol','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	71	+	.append("{'id':" + ISSSL + ",'index':" + (colModelIndex++) + ",'name':'IsSSL','defaultVisibleName':'SSL','visibleName':'SSL','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the HTTP protocol is HTTPS','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	72	+	.append("{'id':" + HOSTNAME + ",'index':" + (colModelIndex++) + ",'name':'Hostname','defaultVisibleName':'Host Name','visibleName':'Host Name','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request host name','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	73	+	.append("{'id':" + PORT + ",'index':" + (colModelIndex++) + ",'name':'TargetPort','defaultVisibleName':'Port','visibleName':'Port','preferredWidth':50,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the target port number','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	74	+	.append("{'id':" + HOST + ",'index':" + (colModelIndex++) + ",'name':'Host','defaultVisibleName':'Host','visibleName':'Host','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Host and Protocol (similar to the Proxy tab)','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	75	+	.append("{'id':" + PATH + ",'index':" + (colModelIndex++) + ",'name':'Path','defaultVisibleName':'Path','visibleName':'Path','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Request Path','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	76	+	.append("{'id':" + EXTENSION + ",'index':" + (colModelIndex++) + ",'name':'UrlExtension','defaultVisibleName':'Extension','visibleName':'Extension','preferredWidth':70,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Target page extension','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	77	+	.append("{'id':" + QUERY + ",'index':" + (colModelIndex++) + ",'name':'Query','defaultVisibleName':'Query','visibleName':'Query','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Query Parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	78	+	.append("{'id':" + STATUS + ",'index':" + (colModelIndex++) + ",'name':'Status','defaultVisibleName':'Status','visibleName':'Status','preferredWidth':55,'type':'short','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Response status header','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	79	+	.append("{'id':" + REQUEST_LENGTH + ",'index':" + (colModelIndex++) + ",'name':'RequestLength','defaultVisibleName':'Request Length','visibleName':'Request Length','preferredWidth':150,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request body length','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	80	+	.append("{'id':" + RESPONSE_LENGTH + ",'index':" + (colModelIndex++) + ",'name':'ResponseLength','defaultVisibleName':'Response Length','visibleName':'Response Length','preferredWidth':125,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Length of response','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	81	+	.append("{'id':" + INFERRED_TYPE + ",'index':" + (colModelIndex++) + ",'name':'InferredType','defaultVisibleName':'Inferred Type','visibleName':'Inferred Type','preferredWidth':100,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows the content type which was inferred by Burp','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	82	+	.append("{'id':" + COMMENT + ",'index':" + (colModelIndex++) + ",'name':'Comment','defaultVisibleName':'Comment','visibleName':'Comment','preferredWidth':200,'type':'string','readonly':false,'order':" + colOrder++ + ",'visible':true,'description':'Editable comment','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	83	+	.append("{'id':" + URL + ",'index':" + (colModelIndex++) + ",'name':'Url','defaultVisibleName':'URL','visibleName':'URL','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Complete URL','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	84	+	.append("{'id':" + MIME_TYPE + ",'index':" + (colModelIndex++) + ",'name':'MimeType','defaultVisibleName':'MIME type','visibleName':'MIME type','preferredWidth':100,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Response content type sent by the server','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	85	+	.append("{'id':" + NEW_COOKIES + ",'index':" + (colModelIndex++) + ",'name':'NewCookies','defaultVisibleName':'New Cookies','visibleName':'New Cookies','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows any new cookies in the response','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	86	+	.append("{'id':" + REQUEST_TIME + ",'index':" + (colModelIndex++) + ",'name':'RequestTime','defaultVisibleName':'Request Time','visibleName':'Request Time','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows date and time of making the request in this extension','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	87	+	.append("{'id':" + RESPONSE_TIME + ",'index':" + (colModelIndex++) + ",'name':'ResponseTime','defaultVisibleName':'Response Time','visibleName':'Response Time','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows date and time of receiving the response in this extension','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	88	+	.append("{'id':" + RTT + ",'index':" + (colModelIndex++) + ",'name':'RTT','defaultVisibleName':'RTT (ms)','visibleName':'RTT (ms)','preferredWidth':100,'type':'int','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows delay between making the request, and receiving the response. Note: Includes BurpSuite processing time','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	89	+	.append("{'id':" + LISTENER_INTERFACE + ",'index':" + (colModelIndex++) + ",'name':'ListenerInterface','defaultVisibleName':'Proxy Listener Interface','visibleName':'Proxy Listener Interface','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Shows the proxy listener interface for proxied requests','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	90	+	.append("{'id':" + CLIENT_IP + ",'index':" + (colModelIndex++) + ",'name':'ClientIP','defaultVisibleName':'Proxy Client IP','visibleName':'Proxy Client IP','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the client IP address when using the Proxy tab','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	91	+	.append("{'id':" + RESPONSE_CONTENT_TYPE + ",'index':" + (colModelIndex++) + ",'name':'ResponseContentType','defaultVisibleName':'Response Content-Type','visibleName':'Response Content-Type','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the content-type header in the response','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	92	+	.append("{'id':" + HASGETPARAM + ",'index':" + (colModelIndex++) + ",'name':'HasQueryStringParam','defaultVisibleName':'QueryString?','visibleName':'QueryString?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request has any querystring parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	93	+	.append("{'id':" + HASPOSTPARAM + ",'index':" + (colModelIndex++) + ",'name':'HasBodyParam','defaultVisibleName':'Body Params?','visibleName':'Body Params?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request contains any POST parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	94	+	.append("{'id':" + HASCOOKIEPARAM + ",'index':" + (colModelIndex++) + ",'name':'HasCookieParam','defaultVisibleName':'Sent Cookie?','visibleName':'Sent Cookie?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the request has any Cookie parameters','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	95	+	.append("{'id':" + SENTCOOKIES + ",'index':" + (colModelIndex++) + ",'name':'SentCookies','defaultVisibleName':'Sent Cookies','visibleName':'Sent Cookies','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the cookies which was sent in the request','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	96	+	.append("{'id':" + USES_COOKIE_JAR_PROXY + ",'index':" + (colModelIndex++) + ",'name':'UsesCookieJar','defaultVisibleName':'Contains cookie jar?','visibleName':'Contains cookie jar?','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Compares the cookies with the cookie jar ones to see if any of them in use','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	97	+	.append("{'id':" + REQUEST_CONTENT_TYPE + ",'index':" + (colModelIndex++) + ",'name':'RequestContentType','defaultVisibleName':'Request Content Type','visibleName':'Request Type','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the request content-type header','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	98	+	.append("{'id':" + REFERRER + ",'index':" + (colModelIndex++) + ",'name':'Referrer','defaultVisibleName':'Referrer','visibleName':'Referrer','preferredWidth':250,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Shows the referer header','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	99	+	.append("{'id':" + HAS_SET_COOKIES + ",'index':" + (colModelIndex++) + ",'name':'HasSetCookies','defaultVisibleName':'Set-Cookie?','visibleName':'Set-Cookie?','preferredWidth':50,'type':'boolean','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Indicates whether or not the response contains the set-cookie header','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	100	+	// .append("{'id':" + REGEX1REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex1Req','defaultVisibleName':'Request RegEx 1','visibleName':'Request RegEx 1','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	101	+	// .append("{'id':" + REGEX2REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex2Req','defaultVisibleName':'Request RegEx 2','visibleName':'Request RegEx 2','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	102	+	// .append("{'id':" + REGEX3REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex3Req','defaultVisibleName':'Request RegEx 3','visibleName':'Request RegEx 3','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	103	+	// .append("{'id':" + REGEX4REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex4Req','defaultVisibleName':'Request RegEx 4','visibleName':'Request RegEx 4','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	104	+	// .append("{'id':" + REGEX5REQ + ",'index':" + (colModelIndex++) + ",'name':'Regex5Req','defaultVisibleName':'Request RegEx 5','visibleName':'Request RegEx 5','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for request header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	105	+	// .append("{'id':" + REGEX1RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex1Resp','defaultVisibleName':'Response RegEx 1','visibleName':'Response RegEx 1 - Title','preferredWidth':220,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':true,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'(?<=\\\\<title\\\\>)(.)+(?=\\\\<\\\\/title\\\\>)','regExCaseSensitive':false},")
	106	+	// .append("{'id':" + REGEX2RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex2Resp','defaultVisibleName':'Response RegEx 2','visibleName':'Response RegEx 2','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	107	+	// .append("{'id':" + REGEX3RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex3Resp','defaultVisibleName':'Response RegEx 3','visibleName':'Response RegEx 3','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':true},")
	108	+	// .append("{'id':" + REGEX4RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex4Resp','defaultVisibleName':'Response RegEx 4','visibleName':'Response RegEx 4','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	109	+	// .append("{'id':" + REGEX5RESP + ",'index':" + (colModelIndex++) + ",'name':'Regex5Resp','defaultVisibleName':'Response RegEx 5','visibleName':'Response RegEx 5','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Custom regular expression for response header/body','isRegEx':true,'regExString':'','regExCaseSensitive':false},")
	110	+	.append("{'id':" + REQUEST_BODY + ",'index':" + (colModelIndex++) + ",'name':'Request','defaultVisibleName':'Request Body','visibleName':'Request Body','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Full Request Body','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	111	+	.append("{'id':" + REQUEST_HEADERS + ",'index':" + (colModelIndex++) + ",'name':'RequestHeaders','defaultVisibleName':'Request Headers','visibleName':'Request Headers','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Comma Delimited Request Headers','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	112	+	.append("{'id':" + RESPONSE_BODY + ",'index':" + (colModelIndex++) + ",'name':'Response','defaultVisibleName':'Response Body','visibleName':'Response Body','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Full Response Body','isRegEx':false,'regExString':'','regExCaseSensitive':false},")
	113	+	.append("{'id':" + RESPONSE_HEADERS + ",'index':" + (colModelIndex++) + ",'name':'ResponseHeaders','defaultVisibleName':'Response Headers','visibleName':'Response Headers','preferredWidth':150,'type':'string','readonly':true,'order':" + colOrder++ + ",'visible':false,'description':'Comma Delimited Response Headers','isRegEx':false,'regExString':'','regExCaseSensitive':false}")
	114	+	.append("]").toString();
	115	+
	116	+
	117	+
115	118
116	119		public static final Pattern UUID_COMMENT_PATTERN = Pattern.compile("\\$LPP:(\\d\\d):(.*?)\\$");
117	120		public static final Pattern HTML_TITLE_PATTERN = Pattern.compile("<title>(.+?)</title>");
		skipped 2 lines

■ ■ ■ ■ ■ ■

src/test/java/TestParser.java

1	1		import com.coreyd97.BurpExtenderUtilities.DefaultGsonProvider;
	2	+	import com.nccgroup.loggerplusplus.filter.parser.FilterParser;
2	3		import com.nccgroup.loggerplusplus.logentry.LogEntry;
3	4		import com.nccgroup.loggerplusplus.filter.parser.ASTExpression;
4	5
		skipped 28 lines

Better default table layout