I2P_Developers/i2p.i2p
3
1
Fork 11
Code Issues 339 Pull Requests 13 Actions 6 Packages Projects Releases Wiki Activity

Console: Use Basic auth for prometheus plugin

Browse Source 
prometheus server doesn't support Digest auth
This commit is contained in:
zzz
2025-04-09 11:16:02 -04:00
parent 27b8a9db4b
commit 6a12347805
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -49,7 +49,9 @@ import net.i2p.util.SystemVersion;
import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.security.authentication.DigestAuthenticator; import org.eclipse.jetty.security.authentication.DigestAuthenticator;
import org.eclipse.jetty.security.authentication.LoginAuthenticator;
import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
@ -116,6 +118,9 @@ public class RouterConsoleRunner implements RouterApp {
// Jetty Auth // Jetty Auth
private static final DigestAuthenticator authenticator = new DigestAuthenticator(); private static final DigestAuthenticator authenticator = new DigestAuthenticator();
// only for prometheus plugin
private static final BasicAuthenticator basicAuthenticator = new BasicAuthenticator();
public static final String PROMETHEUS_REALM = "prometheus";
static { static {
// default changed from 0 (forever) in Jetty 6 to 60*1000 ms in Jetty 7 // default changed from 0 (forever) in Jetty 6 to 60*1000 ms in Jetty 7
authenticator.setMaxNonceAge(7*24*60*60*1000L); authenticator.setMaxNonceAge(7*24*60*60*1000L);
@ -985,15 +990,25 @@ public class RouterConsoleRunner implements RouterApp {
enable = false; enable = false;
ctx.router().saveConfig(PROP_PW_ENABLE, "false"); ctx.router().saveConfig(PROP_PW_ENABLE, "false");
} else { } else {
HashLoginService realm = new CustomHashLoginService(JETTY_REALM, context.getContextPath(), // Prometheus server only supports basic auth
// https://github.com/prometheus/common/issues/352
// Jetty does not support multiple auth at once
// but it's coming for Jetty 12
// https://github.com/jetty/jetty.project/issues/5442
boolean isBasic = context.getContextPath().equals("/prometheus");
// need separate realms so the browser doesn't get them mixed up
String rlm = isBasic ? PROMETHEUS_REALM : JETTY_REALM;
HashLoginService realm = new CustomHashLoginService(rlm, context.getContextPath(),
ctx.logManager().getLog(RouterConsoleRunner.class)); ctx.logManager().getLog(RouterConsoleRunner.class));
sec.setLoginService(realm); sec.setLoginService(realm);
sec.setAuthenticator(authenticator); LoginAuthenticator auth = isBasic ? basicAuthenticator : authenticator;
sec.setAuthenticator(auth);
String[] role = new String[] {JETTY_ROLE}; String[] role = new String[] {JETTY_ROLE};
for (Map.Entry<String, String> e : userpw.entrySet()) { for (Map.Entry<String, String> e : userpw.entrySet()) {
String user = e.getKey(); String user = e.getKey();
String pw = e.getValue(); String pw = e.getValue();
Credential cred = Credential.getCredential(MD5_CREDENTIAL_TYPE + pw); // for basic, the password will be the md5 hash itself
Credential cred = Credential.getCredential(isBasic ? pw : MD5_CREDENTIAL_TYPE + pw);
realm.putUser(user, cred, role); realm.putUser(user, cred, role);
Constraint constraint = new Constraint(user, JETTY_ROLE); Constraint constraint = new Constraint(user, JETTY_ROLE);
constraint.setAuthenticate(true); constraint.setAuthenticate(true);