-
Notifications
You must be signed in to change notification settings - Fork 26.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Support basic auth * Fix sd * Use trie * Fix ut * Fix ut * Fix ut
- Loading branch information
Showing
23 changed files
with
510 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/BasicAuthenticator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.dubbo.auth; | ||
|
|
||
| import org.apache.dubbo.auth.exception.RpcAuthenticationException; | ||
| import org.apache.dubbo.auth.spi.Authenticator; | ||
| import org.apache.dubbo.common.URL; | ||
| import org.apache.dubbo.rpc.Invocation; | ||
|
|
||
| import java.util.Base64; | ||
| import java.util.Objects; | ||
|
|
||
| public class BasicAuthenticator implements Authenticator { | ||
|
|
||
| @Override | ||
| public void sign(Invocation invocation, URL url) { | ||
| String username = url.getParameter(Constants.USERNAME_KEY); | ||
| String password = url.getParameter(Constants.PASSWORD_KEY); | ||
| String auth = username + ":" + password; | ||
| String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes()); | ||
| String authHeaderValue = "Basic " + encodedAuth; | ||
|
|
||
| invocation.setAttachment(Constants.AUTHORIZATION_HEADER_LOWER, authHeaderValue); | ||
| } | ||
|
|
||
| @Override | ||
| public void authenticate(Invocation invocation, URL url) throws RpcAuthenticationException { | ||
| String username = url.getParameter(Constants.USERNAME_KEY); | ||
| String password = url.getParameter(Constants.PASSWORD_KEY); | ||
| String auth = username + ":" + password; | ||
| String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes()); | ||
| String authHeaderValue = "Basic " + encodedAuth; | ||
|
|
||
| if (!Objects.equals(authHeaderValue, invocation.getAttachment(Constants.AUTHORIZATION_HEADER)) | ||
| && !Objects.equals(authHeaderValue, invocation.getAttachment(Constants.AUTHORIZATION_HEADER_LOWER))) { | ||
| throw new RpcAuthenticationException("Failed to authenticate, maybe consumer side did not enable the auth"); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...lugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/filter/ProviderAuthHeaderFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.dubbo.auth.filter; | ||
|
|
||
| import org.apache.dubbo.auth.Constants; | ||
| import org.apache.dubbo.auth.spi.Authenticator; | ||
| import org.apache.dubbo.common.URL; | ||
| import org.apache.dubbo.common.extension.Activate; | ||
| import org.apache.dubbo.rpc.HeaderFilter; | ||
| import org.apache.dubbo.rpc.Invoker; | ||
| import org.apache.dubbo.rpc.RpcContext; | ||
| import org.apache.dubbo.rpc.RpcException; | ||
| import org.apache.dubbo.rpc.RpcInvocation; | ||
| import org.apache.dubbo.rpc.model.FrameworkModel; | ||
| import org.apache.dubbo.rpc.support.RpcUtils; | ||
|
|
||
| import static org.apache.dubbo.rpc.RpcException.AUTHORIZATION_EXCEPTION; | ||
|
|
||
| @Activate(value = Constants.AUTH_KEY, order = -20000) | ||
| public class ProviderAuthHeaderFilter implements HeaderFilter { | ||
| private final FrameworkModel frameworkModel; | ||
|
|
||
| public ProviderAuthHeaderFilter(FrameworkModel frameworkModel) { | ||
| this.frameworkModel = frameworkModel; | ||
| } | ||
|
|
||
| @Override | ||
| public RpcInvocation invoke(Invoker<?> invoker, RpcInvocation invocation) throws RpcException { | ||
| URL url = invoker.getUrl(); | ||
| boolean shouldAuth = url.getParameter(Constants.AUTH_KEY, false); | ||
| if (shouldAuth) { | ||
| Authenticator authenticator = frameworkModel | ||
| .getExtensionLoader(Authenticator.class) | ||
| .getExtension(url.getParameter(Constants.AUTHENTICATOR_KEY, Constants.DEFAULT_AUTHENTICATOR)); | ||
| try { | ||
| authenticator.authenticate(invocation, url); | ||
| } catch (Exception e) { | ||
| Class<?> serviceType = invoker.getInterface(); | ||
| throw new RpcException( | ||
| AUTHORIZATION_EXCEPTION, | ||
| "Forbid invoke remote service " + serviceType + " method " + RpcUtils.getMethodName(invocation) | ||
| + "() from consumer " | ||
| + invocation.getAttributes().get(Constants.REMOTE_ADDRESS_KEY) + " to provider " | ||
| + RpcContext.getServiceContext().getLocalHost()); | ||
| } | ||
| invocation.getAttributes().put(Constants.AUTH_SUCCESS, Boolean.TRUE); | ||
| } | ||
| return invocation; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...o-auth/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.auth.spi.Authenticator
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| accesskey=org.apache.dubbo.auth.AccessKeyAuthenticator | ||
| accesskey=org.apache.dubbo.auth.AccessKeyAuthenticator | ||
| basic=org.apache.dubbo.auth.BasicAuthenticator |
1 change: 1 addition & 0 deletions
1
...n/dubbo-auth/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.HeaderFilter
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| auth=org.apache.dubbo.auth.filter.ProviderAuthHeaderFilter |
Oops, something went wrong.