This commit is contained in:
crusader 2018-06-13 20:40:33 +09:00
parent 2afa70c089
commit ea8d6ed43e
3 changed files with 13 additions and 14 deletions

18
Gopkg.lock generated
View File

@ -42,7 +42,7 @@
"encoding/json", "encoding/json",
"reflect" "reflect"
] ]
revision = "1966a985759721fd451171a78a0b8f4524afc644" revision = "4d4017d214d2a8fdde59d774254f421991fabe7e"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -66,7 +66,7 @@
"model/noauthprobe", "model/noauthprobe",
"model/probe" "model/probe"
] ]
revision = "b65ef6017d0f8bc5642f0e9d3053f0db2ae5c405" revision = "73692449c566a1a6f7e7734b1ba0b33ac2b57213"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -78,7 +78,7 @@
"kafka", "kafka",
"redis" "redis"
] ]
revision = "42e9cb7c30edf264548145a08505fc36cf041ef5" revision = "bcba3516af4af873066d818623c1870d80f1f9d1"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -88,7 +88,7 @@
"subscribe", "subscribe",
"subscribe/redis" "subscribe/redis"
] ]
revision = "cadaf5fb7feccdfdc91371810d95063210dee55b" revision = "9340501b05c5c570dbdf50c4e413fde7d32c9fc1"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -97,7 +97,7 @@
"server", "server",
"servlet" "servlet"
] ]
revision = "ba1c70ca26de859a8ebd528f7f51424dd02451cf" revision = "1db82cb967f26a4cb4031e9fd8efe13031d1793c"
[[projects]] [[projects]]
name = "github.com/BurntSushi/toml" name = "github.com/BurntSushi/toml"
@ -210,7 +210,7 @@
"internal/timeseries", "internal/timeseries",
"trace" "trace"
] ]
revision = "1e491301e022f8f977054da4c2d852decd59571f" revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
[[projects]] [[projects]]
name = "golang.org/x/text" name = "golang.org/x/text"
@ -237,7 +237,7 @@
branch = "master" branch = "master"
name = "google.golang.org/genproto" name = "google.golang.org/genproto"
packages = ["googleapis/rpc/status"] packages = ["googleapis/rpc/status"]
revision = "81158efcc9f219c511e4d3c0d61a0e6e49c01a24" revision = "32ee49c4dd805befd833990acba36cb75042378c"
[[projects]] [[projects]]
name = "google.golang.org/grpc" name = "google.golang.org/grpc"
@ -267,8 +267,8 @@
"tap", "tap",
"transport" "transport"
] ]
revision = "41344da2231b913fa3d983840a57a6b1b7b631a1" revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b"
version = "v1.12.0" version = "v1.12.2"
[[projects]] [[projects]]
name = "gopkg.in/yaml.v2" name = "gopkg.in/yaml.v2"

View File

@ -19,7 +19,7 @@
"external": { "external": {
"grpc": { "grpc": {
"network": "tcp4", "network": "tcp4",
"address": "192.168.1.50:50006" "address": "192.168.1.101:50006"
}, },
"redis": { "redis": {
"network": "tcp4", "network": "tcp4",

View File

@ -127,13 +127,12 @@ func (s *AuthServlets) Handshake(servletCtx server.ServletCtx, ctx *fasthttp.Req
extHeader := &fasthttp.ResponseHeader{} extHeader := &fasthttp.ResponseHeader{}
noAuthProbeStatusType := ocmm.ToNoAuthProbeStatusType(nap.MetaNoAuthProbeStatus.Name) switch ocmm.ToMetaNoAuthProbeStatusEnum(nap.MetaNoAuthProbeStatus) {
switch noAuthProbeStatusType { case ocmm.MetaNoAuthProbeStatusEnumACCEPT:
case ocmm.NoAuthProbeStatusTypeACCEPT:
extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method, occn.HTTPResponseHeaderValue_NoAuthProbe_Method_Accept) extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method, occn.HTTPResponseHeaderValue_NoAuthProbe_Method_Accept)
extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method_Param, nap.Probe.ProbeKey) extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method_Param, nap.Probe.ProbeKey)
case ocmm.NoAuthProbeStatusTypeDENY: case ocmm.MetaNoAuthProbeStatusEnumDENY:
extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method, occn.HTTPResponseHeaderValue_NoAuthProbe_Method_Deny) extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method, occn.HTTPResponseHeaderValue_NoAuthProbe_Method_Deny)
default: default: