Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5752 from ByteHamster/fix-credentials-colon 

Fix credentials with colon
This commit is contained in:
ByteHamster 2022-02-26 18:30:56 +01:00 committed by GitHub
parent 0c1e0b8585 11d44f7140
commit 7a207ce870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/de/danoeh/antennapod/core/service/BasicAuthorizationInterceptor.java
View File

@ -59,14 +59,15 @@ public class BasicAuthorizationInterceptor implements Interceptor {
return response;
}
String[] parts = userInfo.split(":");
if (parts.length != 2) {
if (!userInfo.contains(":")) {
Log.d(TAG, "Invalid credentials for '" + request.url() + "'");
return response;
}
String username = userInfo.substring(0, userInfo.indexOf(':'));
String password = userInfo.substring(userInfo.indexOf(':') + 1);
Log.d(TAG, "Authorization failed, re-trying with ISO-8859-1 encoded credentials");
String credentials = HttpDownloader.encodeCredentials(parts[0], parts[1], "ISO-8859-1");
String credentials = HttpDownloader.encodeCredentials(username, password, "ISO-8859-1");
newRequest.header(HEADER_AUTHORIZATION, credentials);
response = chain.proceed(newRequest.build());
@ -75,7 +76,7 @@ public class BasicAuthorizationInterceptor implements Interceptor {
}
Log.d(TAG, "Authorization failed, re-trying with UTF-8 encoded credentials");
credentials = HttpDownloader.encodeCredentials(parts[0], parts[1], "UTF-8");
credentials = HttpDownloader.encodeCredentials(username, password, "UTF-8");
newRequest.header(HEADER_AUTHORIZATION, credentials);
return chain.proceed(newRequest.build());
}