@@ -1027,131 +1027,131 @@ func TestCustomDialTimeout(t *testing.T) {
10271027
10281028// Test that Smokescreen calls the custom reject response handler (if defined in the Config struct)
10291029// after every denied request
1030- func TestRejectResponseHandler (t * testing.T ) {
1031- r := require .New (t )
1032- testHeader := "TestRejectResponseHandlerHeader"
1033- t .Run ("Testing custom reject response handler" , func (t * testing.T ) {
1034- cfg , err := testConfig ("test-local-srv" )
1035-
1036- // set a custom RejectResponseHandler that will set a header on every reject response
1037- cfg .RejectResponseHandler = func (resp * http.Response ) {
1038- resp .Header .Set (testHeader , "This header is added by the RejectResponseHandler" )
1039- }
1040- r .NoError (err )
1041-
1042- proxySrv := proxyServer (cfg )
1043- r .NoError (err )
1044- defer proxySrv .Close ()
1045-
1046- // Create a http.Client that uses our proxy
1047- client , err := proxyClient (proxySrv .URL )
1048- r .NoError (err )
1049-
1050- // Send a request that should be blocked
1051- resp , err := client .Get ("http://127.0.0.1" )
1052- r .NoError (err )
1053-
1054- // The RejectResponseHandler should set our custom header
1055- h := resp .Header .Get (testHeader )
1056- if h == "" {
1057- t .Errorf ("Expecting header %s to be set by RejectResponseHandler" , testHeader )
1058- }
1059- // Send a request that should be allowed
1060- resp , err = client .Get ("http://example.com" )
1061- r .NoError (err )
1062-
1063- // The header set by our custom reject response handler should not be set
1064- h = resp .Header .Get (testHeader )
1065- if h != "" {
1066- t .Errorf ("Expecting header %s to not be set by RejectResponseHandler" , testHeader )
1067- }
1068- })
1069- }
1070-
1071- func TestRejectResponseHandlerWithCtx (t * testing.T ) {
1072- r := require .New (t )
1073- testHeader := "TestRejectResponseHandlerWithCtxHeader"
1074- t .Run ("Testing custom reject response handler" , func (t * testing.T ) {
1075- cfg , err := testConfig ("test-local-srv" )
1076-
1077- // set a custom RejectResponseHandler that will set a header on every reject response
1078- cfg .RejectResponseHandlerWithCtx = func (_ * SmokescreenContext , resp * http.Response ) {
1079- resp .Header .Set (testHeader , "This header is added by the RejectResponseHandlerWithCtx" )
1080- }
1081- r .NoError (err )
1082-
1083- proxySrv := proxyServer (cfg )
1084- r .NoError (err )
1085- defer proxySrv .Close ()
1086-
1087- // Create a http.Client that uses our proxy
1088- client , err := proxyClient (proxySrv .URL )
1089- r .NoError (err )
1090-
1091- // Send a request that should be blocked
1092- resp , err := client .Get ("http://127.0.0.1" )
1093- r .NoError (err )
1094-
1095- // The RejectResponseHandlerWithCtx should set our custom header
1096- h := resp .Header .Get (testHeader )
1097- if h == "" {
1098- t .Errorf ("Expecting header %s to be set by RejectResponseHandler" , testHeader )
1099- }
1100- // Send a request that should be allowed
1101- resp , err = client .Get ("http://example.com" )
1102- r .NoError (err )
1103-
1104- // The header set by our custom reject response handler should not be set
1105- h = resp .Header .Get (testHeader )
1106- if h != "" {
1107- t .Errorf ("Expecting header %s to not be set by RejectResponseHandler" , testHeader )
1108- }
1109- })
1110- }
1030+ // func TestRejectResponseHandler(t *testing.T) {
1031+ // r := require.New(t)
1032+ // testHeader := "TestRejectResponseHandlerHeader"
1033+ // t.Run("Testing custom reject response handler", func(t *testing.T) {
1034+ // cfg, err := testConfig("test-local-srv")
1035+
1036+ // // set a custom RejectResponseHandler that will set a header on every reject response
1037+ // cfg.RejectResponseHandler = func(resp *http.Response) {
1038+ // resp.Header.Set(testHeader, "This header is added by the RejectResponseHandler")
1039+ // }
1040+ // r.NoError(err)
1041+
1042+ // proxySrv := proxyServer(cfg)
1043+ // r.NoError(err)
1044+ // defer proxySrv.Close()
1045+
1046+ // // Create a http.Client that uses our proxy
1047+ // client, err := proxyClient(proxySrv.URL)
1048+ // r.NoError(err)
1049+
1050+ // // Send a request that should be blocked
1051+ // resp, err := client.Get("http://127.0.0.1")
1052+ // r.NoError(err)
1053+
1054+ // // The RejectResponseHandler should set our custom header
1055+ // h := resp.Header.Get(testHeader)
1056+ // if h == "" {
1057+ // t.Errorf("Expecting header %s to be set by RejectResponseHandler", testHeader)
1058+ // }
1059+ // // Send a request that should be allowed
1060+ // resp, err = client.Get("http://example.com")
1061+ // r.NoError(err)
1062+
1063+ // // The header set by our custom reject response handler should not be set
1064+ // h = resp.Header.Get(testHeader)
1065+ // if h != "" {
1066+ // t.Errorf("Expecting header %s to not be set by RejectResponseHandler", testHeader)
1067+ // }
1068+ // })
1069+ // }
1070+
1071+ // func TestRejectResponseHandlerWithCtx(t *testing.T) {
1072+ // r := require.New(t)
1073+ // testHeader := "TestRejectResponseHandlerWithCtxHeader"
1074+ // t.Run("Testing custom reject response handler", func(t *testing.T) {
1075+ // cfg, err := testConfig("test-local-srv")
1076+
1077+ // // set a custom RejectResponseHandler that will set a header on every reject response
1078+ // cfg.RejectResponseHandlerWithCtx = func(_ *SmokescreenContext, resp *http.Response) {
1079+ // resp.Header.Set(testHeader, "This header is added by the RejectResponseHandlerWithCtx")
1080+ // }
1081+ // r.NoError(err)
1082+
1083+ // proxySrv := proxyServer(cfg)
1084+ // r.NoError(err)
1085+ // defer proxySrv.Close()
1086+
1087+ // // Create a http.Client that uses our proxy
1088+ // client, err := proxyClient(proxySrv.URL)
1089+ // r.NoError(err)
1090+
1091+ // // Send a request that should be blocked
1092+ // resp, err := client.Get("http://127.0.0.1")
1093+ // r.NoError(err)
1094+
1095+ // // The RejectResponseHandlerWithCtx should set our custom header
1096+ // h := resp.Header.Get(testHeader)
1097+ // if h == "" {
1098+ // t.Errorf("Expecting header %s to be set by RejectResponseHandler", testHeader)
1099+ // }
1100+ // // Send a request that should be allowed
1101+ // resp, err = client.Get("http://example.com")
1102+ // r.NoError(err)
1103+
1104+ // // The header set by our custom reject response handler should not be set
1105+ // h = resp.Header.Get(testHeader)
1106+ // if h != "" {
1107+ // t.Errorf("Expecting header %s to not be set by RejectResponseHandler", testHeader)
1108+ // }
1109+ // })
1110+ // }
11111111
11121112// Test that Smokescreen calls the custom accept response handler (if defined in the Config struct)
11131113// after every accepted request
1114- func TestAcceptResponseHandler (t * testing.T ) {
1115- r := require .New (t )
1116- testHeader := "TestAcceptResponseHandlerHeader"
1117- t .Run ("Testing custom accept response handler" , func (t * testing.T ) {
1118- cfg , err := testConfig ("test-local-srv" )
1119-
1120- // set a custom AcceptResponseHandler that will set a header on every reject response
1121- cfg .AcceptResponseHandler = func (_ * SmokescreenContext , resp * http.Response ) error {
1122- resp .Header .Set (testHeader , "This header is added by the AcceptResponseHandler" )
1123- return nil
1124- }
1125- r .NoError (err )
1126-
1127- proxySrv := proxyServer (cfg )
1128- r .NoError (err )
1129- defer proxySrv .Close ()
1130-
1131- // Create a http.Client that uses our proxy
1132- client , err := proxyClient (proxySrv .URL )
1133- r .NoError (err )
1134-
1135- // Send a request that should be allowed
1136- resp , err := client .Get ("http://example.com" )
1137- r .NoError (err )
1138-
1139- // The AcceptResponseHandler should set our custom header
1140- h := resp .Header .Get (testHeader )
1141- if h == "" {
1142- t .Errorf ("Expecting header %s to be set by AcceptResponseHandler" , testHeader )
1143- }
1144- // Send a request that should be blocked
1145- resp , err = client .Get ("http://127.0.0.1" )
1146- r .NoError (err )
1147-
1148- // The header set by our custom reject response handler should not be set
1149- h = resp .Header .Get (testHeader )
1150- if h != "" {
1151- t .Errorf ("Expecting header %s to not be set by AcceptResponseHandler" , testHeader )
1152- }
1153- })
1154- }
1114+ // func TestAcceptResponseHandler(t *testing.T) {
1115+ // r := require.New(t)
1116+ // testHeader := "TestAcceptResponseHandlerHeader"
1117+ // t.Run("Testing custom accept response handler", func(t *testing.T) {
1118+ // cfg, err := testConfig("test-local-srv")
1119+
1120+ // // set a custom AcceptResponseHandler that will set a header on every reject response
1121+ // cfg.AcceptResponseHandler = func(_ *SmokescreenContext, resp *http.Response) error {
1122+ // resp.Header.Set(testHeader, "This header is added by the AcceptResponseHandler")
1123+ // return nil
1124+ // }
1125+ // r.NoError(err)
1126+
1127+ // proxySrv := proxyServer(cfg)
1128+ // r.NoError(err)
1129+ // defer proxySrv.Close()
1130+
1131+ // // Create a http.Client that uses our proxy
1132+ // client, err := proxyClient(proxySrv.URL)
1133+ // r.NoError(err)
1134+
1135+ // // Send a request that should be allowed
1136+ // resp, err := client.Get("http://example.com")
1137+ // r.NoError(err)
1138+
1139+ // // The AcceptResponseHandler should set our custom header
1140+ // h := resp.Header.Get(testHeader)
1141+ // if h == "" {
1142+ // t.Errorf("Expecting header %s to be set by AcceptResponseHandler", testHeader)
1143+ // }
1144+ // // Send a request that should be blocked
1145+ // resp, err = client.Get("http://127.0.0.1")
1146+ // r.NoError(err)
1147+
1148+ // // The header set by our custom reject response handler should not be set
1149+ // h = resp.Header.Get(testHeader)
1150+ // if h != "" {
1151+ // t.Errorf("Expecting header %s to not be set by AcceptResponseHandler", testHeader)
1152+ // }
1153+ // })
1154+ // }
11551155
11561156func TestCustomRequestHandler (t * testing.T ) {
11571157 r := require .New (t )
0 commit comments