diff --git a/filter/filter_impl/auth/accesskey_storage_test.go b/filter/filter_impl/auth/accesskey_storage_test.go index ab734bfb66f107b918c1471107cded52385aab94..15d2ce5b8421670b135b30751e96b6649e4be5dc 100644 --- a/filter/filter_impl/auth/accesskey_storage_test.go +++ b/filter/filter_impl/auth/accesskey_storage_test.go @@ -5,11 +5,14 @@ import ( "testing" ) +import ( + "github.com/stretchr/testify/assert" +) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" invocation2 "github.com/apache/dubbo-go/protocol/invocation" - "github.com/stretchr/testify/assert" ) func TestDefaultAccesskeyStorage_GetAccesskeyPair(t *testing.T) { diff --git a/filter/filter_impl/auth/authenticator.go b/filter/filter_impl/auth/authenticator.go index a3e20c9e3f6b9fe514751af93bd5b175ff959c7a..4cc8d3cdd8cbc0133a464114bae8020d79875dbb 100644 --- a/filter/filter_impl/auth/authenticator.go +++ b/filter/filter_impl/auth/authenticator.go @@ -69,7 +69,7 @@ func (authenticator *DefaultAuthenticator) Authenticate(invocation protocol.Invo consumer := invocation.AttachmentsByKey(constant.CONSUMER, "") if IsEmpty(accessKeyId, false) || IsEmpty(consumer, false) || IsEmpty(requestTimestamp, false) || IsEmpty(originSignature, false) { - return errors.New("failed to authenticate, maybe consumer not enable the auth") + return errors.New("failed to authenticate your ak/sk, maybe the consumer has not enabled the auth") } accessKeyPair, err := getAccessKeyPair(invocation, url) diff --git a/filter/filter_impl/auth/authenticator_test.go b/filter/filter_impl/auth/authenticator_test.go index 6aba4fe76117843d1124bca9719c6b7afb62ca0b..f1e014b5c6ae64efc662d763614e0dd4940edd86 100644 --- a/filter/filter_impl/auth/authenticator_test.go +++ b/filter/filter_impl/auth/authenticator_test.go @@ -9,11 +9,14 @@ import ( "time" ) +import ( + "github.com/stretchr/testify/assert" +) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/protocol/invocation" - "github.com/stretchr/testify/assert" ) func TestDefaultAuthenticator_Authenticate(t *testing.T) { diff --git a/filter/filter_impl/auth/consumer_sign.go b/filter/filter_impl/auth/consumer_sign.go index f17d7e5b647dae2d11d66e75d2060fccb55aad41..506cb91431f281febc39e43ab3aaeb53906e7da3 100644 --- a/filter/filter_impl/auth/consumer_sign.go +++ b/filter/filter_impl/auth/consumer_sign.go @@ -21,8 +21,8 @@ func init() { func (filter *ConsumerSignFilter) Invoke(invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result { logger.Infof("invoking ConsumerSign filter.") url := invoker.GetUrl() - shouldAuth := url.GetParamBool(constant.SERVICE_AUTH_KEY, false) - if shouldAuth { + shouldSign := url.GetParamBool(constant.SERVICE_AUTH_KEY, false) + if shouldSign { authenticator := extension.GetAuthenticator(url.GetParam(constant.AUTHENTICATOR_KEY, constant.DEFAULT_AUTHENTICATOR)) if err := authenticator.Sign(invocation, &url); err != nil { panic(fmt.Sprintf("Sign for invocation %s # %s failed", url.ServiceKey(), invocation.MethodName())) diff --git a/filter/filter_impl/auth/consumer_sign_test.go b/filter/filter_impl/auth/consumer_sign_test.go index 64a1045409f850385391040601a40bc8e8db2fee..23d6ba1b4edd4de1d86dc5bd3bc15bb19f3de47e 100644 --- a/filter/filter_impl/auth/consumer_sign_test.go +++ b/filter/filter_impl/auth/consumer_sign_test.go @@ -5,14 +5,17 @@ import ( "testing" ) +import ( + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" +) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/protocol/invocation" "github.com/apache/dubbo-go/protocol/mock" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" ) func TestConsumerSignFilter_Invoke(t *testing.T) { diff --git a/filter/filter_impl/auth/provider_auth_test.go b/filter/filter_impl/auth/provider_auth_test.go index b75b6b7446d4e0b17cb1f6bef5f10a01d4313818..56c3f6121bf9ca23304df44cfe1febdde955a25a 100644 --- a/filter/filter_impl/auth/provider_auth_test.go +++ b/filter/filter_impl/auth/provider_auth_test.go @@ -6,14 +6,18 @@ import ( "testing" "time" ) + +import ( + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" +) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/protocol/invocation" "github.com/apache/dubbo-go/protocol/mock" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" ) func TestProviderAuthFilter_Invoke(t *testing.T) { diff --git a/filter/filter_impl/auth/sign_util.go b/filter/filter_impl/auth/sign_util.go index 5312ec2c0b4ad016b10b0468eeb27186f4cbce06..5f7e97ed7041a6f6f5136c69529a05b8fafa399e 100644 --- a/filter/filter_impl/auth/sign_util.go +++ b/filter/filter_impl/auth/sign_util.go @@ -47,9 +47,7 @@ func IsEmpty(s string, allowSpace bool) bool { return true } if !allowSpace { - if strings.TrimSpace(s) == "" { - return true - } + return strings.TrimSpace(s) == "" } return false } diff --git a/filter/filter_impl/auth/sign_util_test.go b/filter/filter_impl/auth/sign_util_test.go index 01185f534302080a65821be41be88f3b59a87774..de6154e8854af99f8e862d94ee45aefcbf26b12b 100644 --- a/filter/filter_impl/auth/sign_util_test.go +++ b/filter/filter_impl/auth/sign_util_test.go @@ -3,6 +3,7 @@ package auth import ( "testing" ) + import ( "github.com/stretchr/testify/assert" )