mirror of
https://github.com/sonertari/SSLproxy
synced 2024-11-04 12:00:15 +00:00
Convert a couple of timeout commands to recv, now testproxy errors out if conn end receives timeout command while connected
Clean up testproxy tests
This commit is contained in:
parent
92aecf0bc3
commit
ad1aa909e8
@ -17,50 +17,22 @@
|
||||
"2": {
|
||||
"proto": {
|
||||
"proto": "ssl",
|
||||
"tcp_nodelay": "yes",
|
||||
"ip_ttl": "15",
|
||||
"connect_timeout": "1000",
|
||||
"read_timeout": "50",
|
||||
"write_timeout": "50",
|
||||
"verify_peer": "no",
|
||||
"ciphers": "MEDIUM:HIGH",
|
||||
"no_ssl2": "yes",
|
||||
"no_ssl3": "yes",
|
||||
"no_tls10": "yes",
|
||||
"no_tls11": "yes",
|
||||
"no_tls12": "yes",
|
||||
"no_tls13": "yes",
|
||||
"min_proto_version": "ssl3",
|
||||
"max_proto_version": "tls13",
|
||||
"ecdhcurve": "prime256v1",
|
||||
"use_sni": "no",
|
||||
"verify_hostname": "no",
|
||||
"compression": "no"
|
||||
"crt": "server.crt",
|
||||
"key": "server.key"
|
||||
},
|
||||
"client": {
|
||||
"ip": "127.0.0.1",
|
||||
"port": "8446",
|
||||
"ciphers": "MEDIUM",
|
||||
"use_sni": "yes",
|
||||
"verify_hostname": "yes",
|
||||
"no_tls10": "no",
|
||||
"max_proto_version": "tls11"
|
||||
"port": "8446"
|
||||
},
|
||||
"server": {
|
||||
"ip": "127.0.0.1",
|
||||
"port": "9446",
|
||||
"crt": "server.crt",
|
||||
"key": "server.key",
|
||||
"ciphers": "HIGH",
|
||||
"no_tls12": "no",
|
||||
"min_proto_version": "tls12",
|
||||
"compression": "yes"
|
||||
"port": "9446"
|
||||
}
|
||||
}
|
||||
},
|
||||
"tests": {
|
||||
"1": {
|
||||
"comment": "Removes any extra SSLproxy line",
|
||||
"comment": "Removes any extra SSLproxy line, and appends Connection: close",
|
||||
"states": {
|
||||
"1": {
|
||||
"testend": "client",
|
||||
@ -71,22 +43,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"5": {
|
||||
"testend": "server",
|
||||
"cmd": "timeout",
|
||||
"payload": "",
|
||||
"comment": "Just a sample timeout command"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -102,16 +58,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -127,16 +73,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -152,16 +88,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -177,16 +103,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -202,16 +118,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nAccept-Encoding: encoding\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -227,16 +133,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -252,16 +148,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -277,16 +163,6 @@
|
||||
"testend": "server",
|
||||
"cmd": "recv",
|
||||
"payload": "GET / HTTP/1.1\r\nHost: comixwall.org\r\nConnection: close\r\n\r\n"
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "send",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
},
|
||||
"4": {
|
||||
"testend": "client",
|
||||
"cmd": "recv",
|
||||
"payload": "HTTP/1.1 302 Found\r\nLocation: sslproxy\r\n\r\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -47,7 +47,7 @@
|
||||
},
|
||||
"3": {
|
||||
"testend": "server",
|
||||
"cmd": "timeout",
|
||||
"cmd": "recv",
|
||||
"payload": ""
|
||||
}
|
||||
}
|
||||
|
@ -27,7 +27,7 @@
|
||||
},
|
||||
"2": {
|
||||
"testend": "server",
|
||||
"cmd": "timeout",
|
||||
"cmd": "recv",
|
||||
"payload": ""
|
||||
}
|
||||
}
|
||||
|
@ -29,7 +29,7 @@
|
||||
},
|
||||
"2": {
|
||||
"testend": "server",
|
||||
"cmd": "timeout",
|
||||
"cmd": "recv",
|
||||
"payload": ""
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user