-
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.
[fix][client] Fix the Windows absolute path not recognized in auth pa…
…ram string (#18403)
- Loading branch information
1 parent
6c9ff8f
commit 177b96a
Showing
5 changed files
with
84 additions
and
13 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
31 changes: 31 additions & 0 deletions
31
pulsar-broker/src/test/java/org/apache/pulsar/utils/ResourceUtils.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,31 @@ | ||
| /* | ||
| * 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.utils; | ||
|
|
||
| import com.google.common.io.Resources; | ||
| import java.io.File; | ||
|
|
||
| public class ResourceUtils { | ||
|
|
||
| public static String getAbsolutePath(String resourceName) { | ||
| // On Windows, URL#getPath might return a string that starts with a disk name, e.g. "/C:/" | ||
| // It's invalid to use this path to open a file, so we need to get the absolute path via File. | ||
| return new File(Resources.getResource(resourceName).getPath()).getAbsolutePath(); | ||
| } | ||
| } |
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
36 changes: 36 additions & 0 deletions
36
pulsar-client/src/test/java/org/apache/pulsar/client/impl/AuthenticationUtilTest.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,36 @@ | ||
| /* | ||
| * 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.client.impl; | ||
|
|
||
| import static org.testng.Assert.assertEquals; | ||
| import java.util.Map; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| public class AuthenticationUtilTest { | ||
|
|
||
| @Test | ||
| public void testConfigureAuthParamString() { | ||
| Map<String, String> params = AuthenticationUtil.configureFromPulsar1AuthParamString( | ||
| "key:value,path:C:\\path\\to\\file,null-key:,:null-value,:,key:value-2"); | ||
| assertEquals(params.size(), 3); | ||
| assertEquals(params.get("key"), "value-2"); | ||
| assertEquals(params.get("path"), "C:\\path\\to\\file"); | ||
| assertEquals(params.get("null-key"), ""); | ||
| } | ||
| } |