From 3eee4e2869a783c6f3a5baef279406d82c063f23 Mon Sep 17 00:00:00 2001 From: Bluesaxorcist Date: Sun, 13 Oct 2019 21:21:42 -0500 Subject: renamed all of the iatMode strings to iat-mode --- Examples/OptimizerConfig.json | 2 +- Examples/obfs4Config.json | 2 +- Optimizer.json | 2 +- README.md | 4 ++-- modes/pt_socks5/pt_socks5.go | 4 ++-- modes/stun_udp/stun_udp.go | 4 ++-- modes/transparent_udp/transparent_udp.go | 4 ++-- obfs4.json | 2 +- state/dispatcher.log | 6 ++++++ transports/transports.go | 14 +++++++------- 10 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Examples/OptimizerConfig.json b/Examples/OptimizerConfig.json index 2634491..5857aa6 100644 --- a/Examples/OptimizerConfig.json +++ b/Examples/OptimizerConfig.json @@ -14,7 +14,7 @@ "address": "77.81.104.251:443", "config": { "cert": "a1cc6eI5H+1kTzXhbuwMR9w3ZkLeZuReniier8DYSlAg4ed9yTbnyDiWc1vF1WFWKFRYHQ", - "iatMode": "0" + "iat-mode": "0" } } ] diff --git a/Examples/obfs4Config.json b/Examples/obfs4Config.json index 4138172..e26ea90 100644 --- a/Examples/obfs4Config.json +++ b/Examples/obfs4Config.json @@ -1,4 +1,4 @@ { "cert": "a1cc6eI5H+1kTzXhbuwMR9w3ZkLeZuReniier8DYSlAg4ed9yTbnyDiWc1vF1WFWKFRYHQ", - "iatMode": "0" + "iat-mode": "0" } \ No newline at end of file diff --git a/Optimizer.json b/Optimizer.json index a0edd2c..a93faca 100644 --- a/Optimizer.json +++ b/Optimizer.json @@ -5,7 +5,7 @@ "name": "obfs4", "config": { "cert": "a1cc6eI5H+1kTzXhbuwMR9w3ZkLeZuReniier8DYSlAg4ed9yTbnyDiWc1vF1WFWKFRYHQ", - "iatMode": "0" + "iat-mode": "0" } } ], diff --git a/README.md b/README.md index 296c97c..770309f 100644 --- a/README.md +++ b/README.md @@ -169,14 +169,14 @@ used to hold transport state. The address of the server is specified as command line above. For this demo to work, the dispatcher server needs to be running on this host and port. The obfs4 transport is enabled and bound to the address 127.0.0.1 and the port 1443. The -optionsFile parameter is different for -every transport. For obfs4, the "cert" and "iatMode" parameters are required. +every transport. For obfs4, the "cert" and "iat-mode" parameters are required. These can be found in the obfs4_bridgeline.txt in the server state directory, which is generated by the server the first time that it is run. It is important for the cert parameter to be correct, otherwise obfs4 will silently fail. You can input your parameters in the Obfs4.json file in the shapeshifter-dispatcher folder or you can put the parameters in directly in this format: -bin/shapeshifter-dispatcher -transparent -client -state state -target 127.0.0.1:2222 -transports obfs4 -proxylistenaddr 127.0.0.1:1443 -options '{"cert": "OfQAPDamjsRO90fDGlnZR5RNG659FZqUKUwxUHcaK7jIbERvNU8+EVF6rmdlvS69jVYrKw", "iatMode": "0"}' -logLevel DEBUG -enableLogging +bin/shapeshifter-dispatcher -transparent -client -state state -target 127.0.0.1:2222 -transports obfs4 -proxylistenaddr 127.0.0.1:1443 -options '{"cert": "OfQAPDamjsRO90fDGlnZR5RNG659FZqUKUwxUHcaK7jIbERvNU8+EVF6rmdlvS69jVYrKw", "iat-mode": "0"}' -logLevel DEBUG -enableLogging Logging is enabled and set to DEBUG level. diff --git a/modes/pt_socks5/pt_socks5.go b/modes/pt_socks5/pt_socks5.go index 59c4a7c..90bf7fc 100644 --- a/modes/pt_socks5/pt_socks5.go +++ b/modes/pt_socks5/pt_socks5.go @@ -184,13 +184,13 @@ func ServerSetup(termMon *termmon.TermMonitor, bindaddrString string, ptServerIn listen = transport.Listen case "obfs4": if cert, ok := args["cert"]; ok { - if iatModeStr, ok2 := args["iatMode"]; ok2 { + if iatModeStr, ok2 := args["iat-mode"]; ok2 { iatMode, err := strconv.Atoi(iatModeStr[0]) if err != nil { transport := obfs4.NewObfs4Client(cert[0], iatMode) listen = transport.Listen } else { - log.Errorf("obfs4 transport bad iatMode value: %s", iatModeStr) + log.Errorf("obfs4 transport bad iat-mode value: %s", iatModeStr) return } } else { diff --git a/modes/stun_udp/stun_udp.go b/modes/stun_udp/stun_udp.go index 70d5565..cba7132 100644 --- a/modes/stun_udp/stun_udp.go +++ b/modes/stun_udp/stun_udp.go @@ -215,13 +215,13 @@ func ServerSetup(termMon *termmon.TermMonitor, bindaddrString string, ptServerIn listen=transport.Listen case "obfs4": if cert, ok := args["cert"]; ok { - if iatModeStr, ok2 := args["iatMode"]; ok2 { + if iatModeStr, ok2 := args["iat-mode"]; ok2 { iatMode, err := strconv.Atoi(iatModeStr[0]) if err != nil { transport := obfs4.NewObfs4Client(cert[0], iatMode) listen=transport.Listen } else { - log.Errorf("obfs4 transport bad iatMode value: %s", iatModeStr) + log.Errorf("obfs4 transport bad iat-mode value: %s", iatModeStr) return } } else { diff --git a/modes/transparent_udp/transparent_udp.go b/modes/transparent_udp/transparent_udp.go index f40da14..d69059d 100644 --- a/modes/transparent_udp/transparent_udp.go +++ b/modes/transparent_udp/transparent_udp.go @@ -234,13 +234,13 @@ func ServerSetup(termMon *termmon.TermMonitor, bindaddrString string, ptServerIn listen = transport.Listen case "obfs4": if cert, ok := args["cert"]; ok { - if iatModeStr, ok2 := args["iatMode"]; ok2 { + if iatModeStr, ok2 := args["iat-mode"]; ok2 { iatMode, err := strconv.Atoi(iatModeStr[0]) if err != nil { transport := obfs4.NewObfs4Client(cert[0], iatMode) listen = transport.Listen } else { - log.Errorf("obfs4 transport bad iatMode value: %s", iatModeStr) + log.Errorf("obfs4 transport bad iat-mode value: %s", iatModeStr) return } } else { diff --git a/obfs4.json b/obfs4.json index 2697889..3ff1323 100644 --- a/obfs4.json +++ b/obfs4.json @@ -1 +1 @@ -{"cert": "a1cc6eI5H+1kTzXhbuwMR9w3ZkLeZuReniier8DYSlAg4ed9yTbnyDiWc1vF1WFWKFRYHQ", "iatMode": "0"} \ No newline at end of file +{"cert": "a1cc6eI5H+1kTzXhbuwMR9w3ZkLeZuReniier8DYSlAg4ed9yTbnyDiWc1vF1WFWKFRYHQ", "iat-mode": "0"} \ No newline at end of file diff --git a/state/dispatcher.log b/state/dispatcher.log index 8fd13d5..8c0f59c 100644 --- a/state/dispatcher.log +++ b/state/dispatcher.log @@ -319,3 +319,9 @@ 2019/10/07 19:45:43 [INFO]: ___go_build_github_com_OperatorFoundation_shapeshifter_dispatcher_shapeshifter_dispatcher - initializing client transport listeners 2019/10/07 19:45:43 [INFO]: Optimizer - registered listener: 127.0.0.1:1444 2019/10/07 19:45:43 [INFO]: ___go_build_github_com_OperatorFoundation_shapeshifter_dispatcher_shapeshifter_dispatcher - accepting connections +2019/10/13 21:11:57 [NOTICE]: dispatcher-0.0.7-dev - launched +2019/10/13 21:11:57 [INFO]: ___go_build_github_com_OperatorFoundation_shapeshifter_dispatcher_shapeshifter_dispatcher - initializing transparent proxy +2019/10/13 21:11:57 [INFO]: ___go_build_github_com_OperatorFoundation_shapeshifter_dispatcher_shapeshifter_dispatcher - initializing TCP transparent proxy +2019/10/13 21:11:57 [INFO]: ___go_build_github_com_OperatorFoundation_shapeshifter_dispatcher_shapeshifter_dispatcher - initializing client transport listeners +2019/10/13 21:11:57 [INFO]: Optimizer - registered listener: 127.0.0.1:1444 +2019/10/13 21:11:57 [INFO]: ___go_build_github_com_OperatorFoundation_shapeshifter_dispatcher_shapeshifter_dispatcher - accepting connections diff --git a/transports/transports.go b/transports/transports.go index ac7a69b..5cfd468 100644 --- a/transports/transports.go +++ b/transports/transports.go @@ -71,9 +71,9 @@ func ParseArgsObfs4(args map[string]interface{}, target string) (*obfs4.Transpor return nil, errors.New("unsupported type for obfs4 cert option") } - untypedIatMode, ok2 := args["iatMode"] + untypedIatMode, ok2 := args["iat-mode"] if !ok2 { - return nil, errors.New("obfs4 transport missing iatMode argument") + return nil, errors.New("obfs4 transport missing iat-mode argument") } switch untypedCert.(type) { @@ -84,7 +84,7 @@ func ParseArgsObfs4(args map[string]interface{}, target string) (*obfs4.Transpor } iatModeInt, scerr := strconv.Atoi(iatModeStr) if scerr != nil { - return nil, errors.New("obfs4 transport bad iatMode value") + return nil, errors.New("obfs4 transport bad iat-mode value") } switch iatModeInt { case 0: @@ -92,7 +92,7 @@ func ParseArgsObfs4(args map[string]interface{}, target string) (*obfs4.Transpor case 1: iatMode = iatModeInt default: - return nil, errors.New("unsupported value for obfs4 iatMode option") + return nil, errors.New("unsupported value for obfs4 iat-mode option") } case float64: iatModeFloat, icerr := interconv.ParseFloat64(untypedIatMode) @@ -106,7 +106,7 @@ func ParseArgsObfs4(args map[string]interface{}, target string) (*obfs4.Transpor case 1: iatMode = iatModeInt default: - return nil, errors.New("unsupported value for obfs4 iatMode option") + return nil, errors.New("unsupported value for obfs4 iat-mode option") } case int: iatModeInt, icerr := interconv.ParseInt(untypedIatMode) @@ -119,7 +119,7 @@ func ParseArgsObfs4(args map[string]interface{}, target string) (*obfs4.Transpor case 1: iatMode = iatModeInt default: - return nil, errors.New("unsupported value for obfs4 iatMode option") + return nil, errors.New("unsupported value for obfs4 iat-mode option") } case bool: iatModeBool, icerr := interconv.ParseBoolean(untypedCert) @@ -133,7 +133,7 @@ func ParseArgsObfs4(args map[string]interface{}, target string) (*obfs4.Transpor iatMode = 0 } default: - return nil, errors.New("unsupported type for obfs4 iatMode option") + return nil, errors.New("unsupported type for obfs4 iat-mode option") } transport := obfs4.Transport{ -- cgit v1.2.3