-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Avoid AuthenticationDataSource mutation for subscription name (#16065)
The `authenticationData` field in `ServerCnx` is being mutated to add the `subscription` field that will be passed on to the authorization plugin. The problem is that `authenticationData` is scoped to the whole connection and it should be getting mutated for each consumer that is created on the connection. The current code leads to a race condition where the subscription name used in the authz plugin is already modified while we're looking at it. Instead, we should create a new object and enforce the final modifier. (cherry picked from commit e6b12c6)
- Loading branch information
1 parent
3211f91
commit 4225887
Showing
3 changed files
with
88 additions
and
49 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
74 changes: 74 additions & 0 deletions
74
...src/main/java/org/apache/pulsar/broker/authentication/AuthenticationDataSubscription.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,74 @@ | ||
| /** | ||
| * 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.pulsar.broker.authentication; | ||
|
|
||
| import java.net.SocketAddress; | ||
| import java.security.cert.Certificate; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| public class AuthenticationDataSubscription implements AuthenticationDataSource { | ||
| private final AuthenticationDataSource authData; | ||
| private final String subscription; | ||
|
|
||
| public AuthenticationDataSubscription(AuthenticationDataSource authData, String subscription) { | ||
| this.authData = authData; | ||
| this.subscription = subscription; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasDataFromCommand() { | ||
| return authData.hasDataFromCommand(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getCommandData() { | ||
| return authData.getCommandData(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasDataFromPeer() { | ||
| return authData.hasDataFromPeer(); | ||
| } | ||
|
|
||
| @Override | ||
| public SocketAddress getPeerAddress() { | ||
| return authData.getPeerAddress(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasDataFromTls() { | ||
| return authData.hasDataFromTls(); | ||
| } | ||
|
|
||
| @Override | ||
| public Certificate[] getTlsCertificates() { | ||
| return authData.getTlsCertificates(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasSubscription() { | ||
| return this.subscription != null; | ||
| } | ||
|
|
||
| @Override | ||
| public String getSubscription() { | ||
| return subscription; | ||
| } | ||
| } |
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