From ea8d6ed43e0319b788b61ab88848fc5435d41646 Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 13 Jun 2018 20:40:33 +0900 Subject: [PATCH] ing --- Gopkg.lock | 18 +++++++++--------- config.json | 2 +- servlet/auth-servlet.go | 7 +++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index db81362..e462965 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -42,7 +42,7 @@ "encoding/json", "reflect" ] - revision = "1966a985759721fd451171a78a0b8f4524afc644" + revision = "4d4017d214d2a8fdde59d774254f421991fabe7e" [[projects]] branch = "master" @@ -66,7 +66,7 @@ "model/noauthprobe", "model/probe" ] - revision = "b65ef6017d0f8bc5642f0e9d3053f0db2ae5c405" + revision = "73692449c566a1a6f7e7734b1ba0b33ac2b57213" [[projects]] branch = "master" @@ -78,7 +78,7 @@ "kafka", "redis" ] - revision = "42e9cb7c30edf264548145a08505fc36cf041ef5" + revision = "bcba3516af4af873066d818623c1870d80f1f9d1" [[projects]] branch = "master" @@ -88,7 +88,7 @@ "subscribe", "subscribe/redis" ] - revision = "cadaf5fb7feccdfdc91371810d95063210dee55b" + revision = "9340501b05c5c570dbdf50c4e413fde7d32c9fc1" [[projects]] branch = "master" @@ -97,7 +97,7 @@ "server", "servlet" ] - revision = "ba1c70ca26de859a8ebd528f7f51424dd02451cf" + revision = "1db82cb967f26a4cb4031e9fd8efe13031d1793c" [[projects]] name = "github.com/BurntSushi/toml" @@ -210,7 +210,7 @@ "internal/timeseries", "trace" ] - revision = "1e491301e022f8f977054da4c2d852decd59571f" + revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196" [[projects]] name = "golang.org/x/text" @@ -237,7 +237,7 @@ branch = "master" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - revision = "81158efcc9f219c511e4d3c0d61a0e6e49c01a24" + revision = "32ee49c4dd805befd833990acba36cb75042378c" [[projects]] name = "google.golang.org/grpc" @@ -267,8 +267,8 @@ "tap", "transport" ] - revision = "41344da2231b913fa3d983840a57a6b1b7b631a1" - version = "v1.12.0" + revision = "7a6a684ca69eb4cae85ad0a484f2e531598c047b" + version = "v1.12.2" [[projects]] name = "gopkg.in/yaml.v2" diff --git a/config.json b/config.json index d8b87ec..3ff943c 100644 --- a/config.json +++ b/config.json @@ -19,7 +19,7 @@ "external": { "grpc": { "network": "tcp4", - "address": "192.168.1.50:50006" + "address": "192.168.1.101:50006" }, "redis": { "network": "tcp4", diff --git a/servlet/auth-servlet.go b/servlet/auth-servlet.go index 4880f30..5d558f7 100644 --- a/servlet/auth-servlet.go +++ b/servlet/auth-servlet.go @@ -127,13 +127,12 @@ func (s *AuthServlets) Handshake(servletCtx server.ServletCtx, ctx *fasthttp.Req extHeader := &fasthttp.ResponseHeader{} - noAuthProbeStatusType := ocmm.ToNoAuthProbeStatusType(nap.MetaNoAuthProbeStatus.Name) - switch noAuthProbeStatusType { - case ocmm.NoAuthProbeStatusTypeACCEPT: + switch ocmm.ToMetaNoAuthProbeStatusEnum(nap.MetaNoAuthProbeStatus) { + case ocmm.MetaNoAuthProbeStatusEnumACCEPT: extHeader.Add(occn.HTTPResponseHeaderKey_NoAuthProbe_Method, occn.HTTPResponseHeaderValue_NoAuthProbe_Method_Accept) 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) default: