Mirrors/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2025-05-18 22:59:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix UserDB.proxyAuth from header string

Browse Source 
(take care of prefix "Basic" in header entry)
This commit is contained in:
reger 2016-11-18 01:12:14 +01:00
parent fd22d8c08b
commit 28afd3a2f8
1 changed files with 14 additions and 10 deletions

24
source/net/yacy/data/UserDB.java

@ -35,6 +35,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
import javax.servlet.http.HttpServletRequest;
import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.order.Base64Order;
@ -129,18 +130,21 @@ public final class UserDB {
}
/**
* Use a ProxyAuth Value to authenticate user.
* @param auth base64 Encoded String, which contains "username:pw".
* Use a ProxyAuth Value to authenticate user from HttpHeader.Authentication.
* This supports only Basic authentication
* @param auth "BASIC " followed by base64 Encoded String, which contains "username:pw" for basic authentication
*/
public Entry proxyAuth(final String auth) {
public Entry proxyAuth(final String authHeader) {
Entry entry = null;
if (auth != null) {
final String[] tmp = Base64Order.standardCoder.decodeString(auth.trim()).split(":");
if (tmp.length == 2) {
entry = this.passwordAuth(tmp[0], tmp[1]);
if (entry == null) {
entry = this.md5Auth(tmp[0], tmp[1]);
if (authHeader != null) {
if (authHeader.toUpperCase().startsWith(HttpServletRequest.BASIC_AUTH)) {
String auth = authHeader.substring(6); // take out prefix "BASIC"
final String[] tmp = Base64Order.standardCoder.decodeString(auth.trim()).split(":");
if (tmp.length == 2) {
entry = this.passwordAuth(tmp[0], tmp[1]);
if (entry == null) {
entry = this.md5Auth(tmp[0], tmp[1]);
}
}
}
}