Apache/httpcomponents-client
1
0
Fork 0
mirror of https://github.com/apache/httpcomponents-client.git synced 2025-02-17 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-2009: Fxied StringIndexOutOfBoundsException in AuthSupport#extractFromAuthority

Browse Source
This commit is contained in:
itonyli 2019-08-11 20:38:10 +08:00 committed by Oleg Kalnichevski
parent 00012c5786
commit 90e34878a1
2 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
httpclient5/src/main/java/org/apache/hc/client5/http/impl/AuthSupport.java
View File

@ -54,20 +54,14 @@ public static void extractFromAuthority(
if (authority == null) { if (authority == null) {
return; return;
} }
final String userinfo = authority.getUserInfo(); final String userInfo = authority.getUserInfo();
if (userinfo == null) { if (userInfo == null) {
return; return;
} }
final int atColon = userinfo.indexOf(':'); final int atColon = userInfo.indexOf(':');
final String userName; final String userName = atColon >= 0 ? userInfo.substring(0, atColon) : userInfo;
final char[] password; final char[] password = atColon >= 0 ? userInfo.substring(atColon + 1).toCharArray() : null;
if (atColon >= 0) {
userName = userinfo.substring(0, atColon);
password = userinfo.substring(atColon + 1).toCharArray();
} else {
userName = userinfo.substring(0, atColon);
password = null;
}
credentialsStore.setCredentials( credentialsStore.setCredentials(
new AuthScope(scheme, authority.getHostName(), authority.getPort(), null, AuthSchemes.BASIC.ident), new AuthScope(scheme, authority.getHostName(), authority.getPort(), null, AuthSchemes.BASIC.ident),
new UsernamePasswordCredentials(userName, password)); new UsernamePasswordCredentials(userName, password));

52
httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthSupport.java Normal file
View File

@ -0,0 +1,52 @@
/*
* ====================================================================
* 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.hc.client5.http.impl;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
import org.apache.hc.core5.net.URIAuthority;
import org.junit.Assert;
import org.junit.Test;
/**
* Simple tests for {@link AuthSupport}.
*/
public class TestAuthSupport {
@Test
public void testExtractFromAuthority() {
final URIAuthority uriAuthority = new URIAuthority("testUser", "localhost", 8080);
final BasicCredentialsProvider basicCredentialsProvider = new BasicCredentialsProvider();
AuthSupport.extractFromAuthority("http", uriAuthority, basicCredentialsProvider);
final Credentials credentials = basicCredentialsProvider.getCredentials(new AuthScope("localhost", 8080), null);
Assert.assertEquals("testUser", credentials.getUserPrincipal().getName());
Assert.assertNull(credentials.getPassword());
}
}