kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2025-01-09 19:10:29 +05:30
Code Issues Projects Releases Wiki Activity

Better Error handling for oidc config

Browse Source
This commit is contained in:
Jeidnx 2023-06-19 13:11:20 +02:00
parent 604fa651fc
commit 375ee585c1
No known key found for this signature in database
GPG Key ID: 0E9E697B7E99DF39
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.properties
View File

@ -84,4 +84,6 @@ hibernate.connection.password:changeme
#oidc.provider.INSERT_HERE.name:INSERT_HERE #oidc.provider.INSERT_HERE.name:INSERT_HERE
#oidc.provider.INSERT_HERE.clientId:INSERT_HERE #oidc.provider.INSERT_HERE.clientId:INSERT_HERE
#oidc.provider.INSERT_HERE.clientSecret:INSERT_HERE #oidc.provider.INSERT_HERE.clientSecret:INSERT_HERE
#oidc.provider.INSERT_HERE.authUrl:INSERT_HERE #oidc.provider.INSERT_HERE.authUri:INSERT_HERE
#oidc.provider.INSERT_HERE.tokenUri:INSERT_HERE
#oidc.provider.INSERT_HERE.userinfoUri:INSERT_HERE

39
src/main/java/me/kavin/piped/consts/Constants.java
View File

@ -26,7 +26,7 @@ import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.ProxySelector; import java.net.ProxySelector;
import java.util.LinkedList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -102,7 +102,7 @@ public class Constants {
public static final String YOUTUBE_COUNTRY; public static final String YOUTUBE_COUNTRY;
public static final String VERSION; public static final String VERSION;
public static final LinkedList<OidcProvider> OIDC_PROVIDERS; public static final ArrayList<OidcProvider> OIDC_PROVIDERS;
public static final ObjectMapper mapper = JsonMapper.builder() public static final ObjectMapper mapper = JsonMapper.builder()
.addMixIn(Page.class, PageMixin.class) .addMixIn(Page.class, PageMixin.class)
@ -167,7 +167,7 @@ public class Constants {
MATRIX_TOKEN = getProperty(prop, "MATRIX_TOKEN"); MATRIX_TOKEN = getProperty(prop, "MATRIX_TOKEN");
GEO_RESTRICTION_CHECKER_URL = getProperty(prop, "GEO_RESTRICTION_CHECKER_URL"); GEO_RESTRICTION_CHECKER_URL = getProperty(prop, "GEO_RESTRICTION_CHECKER_URL");
OIDC_PROVIDERS = new LinkedList<>(); OIDC_PROVIDERS = new ArrayList<>();
ArrayNode providerNames = frontendProperties.putArray("oidcProviders"); ArrayNode providerNames = frontendProperties.putArray("oidcProviders");
prop.forEach((_key, _value) -> { prop.forEach((_key, _value) -> {
String key = String.valueOf(_key), value = String.valueOf(_value); String key = String.valueOf(_key), value = String.valueOf(_value);
@ -178,21 +178,15 @@ public class Constants {
else if (key.startsWith("oidc.provider")) { else if (key.startsWith("oidc.provider")) {
String[] split = key.split("\\."); String[] split = key.split("\\.");
if (split.length != 4 || !split[3].equals("name")) return; if (split.length != 4 || !split[3].equals("name")) return;
OIDC_PROVIDERS.add(new OidcProvider(
try { value,
OIDC_PROVIDERS.add(new OidcProvider( getRequiredOidcProperty(prop, value, "clientId"),
value, getRequiredOidcProperty(prop, value, "clientSecret"),
getProperty(prop, "oidc.provider." + value + ".clientId"), getRequiredOidcProperty(prop, value, "authUri"),
getProperty(prop, "oidc.provider." + value + ".clientSecret"), getRequiredOidcProperty(prop, value, "tokenUri"),
getProperty(prop, "oidc.provider." + value + ".authUrl"), getRequiredOidcProperty(prop, value, "userinfoUri"))
getProperty(prop, "oidc.provider." + value + ".tokenUrl"), );
getProperty(prop, "oidc.provider." + value + ".userinfoUrl") providerNames.add(value);
));
} catch (Exception e) {
System.err.println("Error while getting properties for oidc provider '" + value + "'");
throw new RuntimeException(e);
}
providerNames.add(value);
} }
}); });
frontendProperties.put("imageProxyUrl", IMAGE_PROXY_PART); frontendProperties.put("imageProxyUrl", IMAGE_PROXY_PART);
@ -256,4 +250,13 @@ public class Constants {
return prop.getProperty(key, def); return prop.getProperty(key, def);
} }
private static String getRequiredOidcProperty(final Properties prop, String provider, String key) {
String value = getProperty(prop, "oidc.provider." + provider + "." + key);
if(value == null || value.equals("")){
System.err.println("Missing " + key + " for oidc provider '" + provider + "'");
System.exit(1);
}
return value;
}
} }

13
src/main/java/me/kavin/piped/utils/obj/OidcProvider.java
View File

@ -14,12 +14,17 @@ public class OidcProvider {
public URI tokenUri; public URI tokenUri;
public URI userinfoUri; public URI userinfoUri;
public OidcProvider(String name, String clientID, String clientSecret, String authUri, String tokenUri, String userinfoUri) throws URISyntaxException { public OidcProvider(String name, String clientID, String clientSecret, String authUri, String tokenUri, String userinfoUri) {
this.name = name; this.name = name;
this.clientID = new ClientID(clientID); this.clientID = new ClientID(clientID);
this.clientSecret = new Secret(clientSecret); this.clientSecret = new Secret(clientSecret);
this.authUri = new URI(authUri); try {
this.tokenUri = new URI(tokenUri); this.authUri = new URI(authUri);
this.userinfoUri = new URI(userinfoUri); this.tokenUri = new URI(tokenUri);
this.userinfoUri = new URI(userinfoUri);
} catch(URISyntaxException e) {
System.err.println("Malformed URI for oidc provider '" + name + "' found.");
System.exit(1);
}
} }
} }