Release datarouter 0.0.126

Author: pranavbheda

datarouter-auth-web/README.md

@@ -8,7 +8,7 @@ datarouter-auth-web is a framework that brings in users and apikey accounts to d
 <dependency>
 	<groupId>io.datarouter</groupId>
 	<artifactId>datarouter-auth-web</artifactId>
-	<version>0.0.125</version>
+	<version>0.0.126</version>
 </dependency>
 ```
 

datarouter-auth-web/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>io.datarouter</groupId>
 		<artifactId>datarouter-parent</artifactId>
-		<version>0.0.125</version>
+		<version>0.0.126</version>
 		<relativePath>../datarouter-parent</relativePath>
 	</parent>
 

datarouter-auth-web/src/main/java/io/datarouter/auth/web/cache/DatarouterAccountPermissionKeysByPrefixCache.java

@@ -19,19 +19,19 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.datarouter.auth.storage.account.permission.BaseDatarouterAccountPermissionDao;
+import io.datarouter.auth.storage.account.permission.DatarouterAccountPermissionDao;
 import io.datarouter.auth.storage.account.permission.DatarouterAccountPermissionKey;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
 @Singleton
 public class DatarouterAccountPermissionKeysByPrefixCache{
 
-	private final BaseDatarouterAccountPermissionDao dao;
+	private final DatarouterAccountPermissionDao dao;
 	private final AtomicReference<Map<DatarouterAccountPermissionKey,List<DatarouterAccountPermissionKey>>> cache;
 
 	@Inject
-	public DatarouterAccountPermissionKeysByPrefixCache(BaseDatarouterAccountPermissionDao dao){
+	public DatarouterAccountPermissionKeysByPrefixCache(DatarouterAccountPermissionDao dao){
 		this.dao = dao;
 		this.cache = new AtomicReference<>(load());
 	}

datarouter-auth-web/src/main/java/io/datarouter/auth/web/client/BaseDatarouterClientSettings.java

@@ -36,11 +36,15 @@ public abstract class BaseDatarouterClientSettings
 	public final RefreshableSupplier<String> refreshableApiKey;
 	public final RefreshableSupplier<String> refreshablePrivateKey;
 
+	// Fixed value that could potentially become a setting, if needed.
+	public final String clientName;
+
 	//This newer constructor doesn't need DatarouterService
 	public BaseDatarouterClientSettings(
 			SettingFinder finder,
 			DefaultDatarouterAccountKeysSupplier defaultDatarouterAccountKeys,
 			String settingNodeName,
+			String clientName,
 			String contextPath,
 			DefaultSettingValue<String> endpointDomainDefaults){
 		super(finder, settingNodeName);
@@ -50,6 +54,7 @@ public BaseDatarouterClientSettings(
 		privateKey = registerString("privateKey", defaultDatarouterAccountKeys.getDefaultSecretKey());
 		refreshableApiKey = new RefreshableStringCachedSetting(apiKey);
 		refreshablePrivateKey = new RefreshableStringCachedSetting(privateKey);
+		this.clientName = clientName;
 	}
 
 	@Override
@@ -77,4 +82,9 @@ public RefreshableSupplier<String> getRefreshablePrivateKey(){
 		return refreshablePrivateKey;
 	}
 
+	@Override
+	public String getClientName(){
+		return clientName;
+	}
+
 }

datarouter-auth-web/src/main/java/io/datarouter/auth/web/client/BaseSimpleDatarouterClientSettings.java

@@ -34,7 +34,6 @@ public abstract class BaseSimpleDatarouterClientSettings
 
 	public final CachedSetting<DatarouterDuration> timeout;
 	public final CachedSetting<Integer> numRetries;
-	public final CachedSetting<Boolean> enableBreakers;
 	public final Setting<Boolean> traceInQueryString;
 	public final Setting<Boolean> debugLog;
 
@@ -44,7 +43,6 @@ public BaseSimpleDatarouterClientSettings(
 		super(finder, settingNodeName);
 		timeout = registerDurations("timeout", getTimeoutDefaultSettingValue());
 		numRetries = registerIntegers("numRetries", getNumRetriesDefault());
-		enableBreakers = registerBooleans("enableBreakers", getEnableBreakersDefault());
 		traceInQueryString = registerBoolean("traceInQueryString", false);
 		debugLog = registerBoolean("debugLog", false);
 	}
@@ -59,11 +57,6 @@ public final Supplier<Integer> getNumRetries(){
 		return numRetries;
 	}
 
-	@Override
-	public final Supplier<Boolean> getEnableBreakers(){
-		return enableBreakers;
-	}
-
 	@Override
 	public Setting<Boolean> getTraceInQueryString(){
 		return traceInQueryString;

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/ApiDocsNavBarItem.java

@@ -34,7 +34,7 @@ public class ApiDocsNavBarItem implements DynamicNavBarItem{
 
 	@Override
 	public NavBarItem getNavBarItem(){
-		return new NavBarItem(AppNavBarCategory.DOCS, paths.docs.join("/", "/", "/"), "Api Docs");
+		return new NavBarItem(AppNavBarCategory.DOCS, paths.docs.toSlashedString(), "Api Docs");
 	}
 
 	@Override

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/DatarouterAuthPlugin.java

@@ -19,22 +19,17 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import io.datarouter.auth.config.DatarouterAuthPaths;
 import io.datarouter.auth.service.DatarouterUserService;
 import io.datarouter.auth.service.UserInfo;
 import io.datarouter.auth.service.deprovisioning.UserDeprovisioningStrategy;
-import io.datarouter.auth.storage.account.BaseDatarouterAccountDao;
 import io.datarouter.auth.storage.account.DatarouterAccountDao;
 import io.datarouter.auth.storage.account.DatarouterAccountDao.DatarouterAccountDaoParams;
-import io.datarouter.auth.storage.account.credential.BaseDatarouterAccountCredentialDao;
 import io.datarouter.auth.storage.account.credential.DatarouterAccountCredentialDao;
 import io.datarouter.auth.storage.account.credential.DatarouterAccountCredentialDao.DatarouterAccountCredentialDaoParams;
-import io.datarouter.auth.storage.account.credential.secret.BaseDatarouterAccountSecretCredentialDao;
 import io.datarouter.auth.storage.account.credential.secret.DatarouterAccountSecretCredentialDao;
 import io.datarouter.auth.storage.account.credential.secret.DatarouterAccountSecretCredentialDao.DatarouterAccountSecretCredentialDaoParams;
-import io.datarouter.auth.storage.account.permission.BaseDatarouterAccountPermissionDao;
 import io.datarouter.auth.storage.account.permission.DatarouterAccountPermissionDao;
 import io.datarouter.auth.storage.account.permission.DatarouterAccountPermissionDao.DatarouterAccountPermissionDaoParams;
 import io.datarouter.auth.storage.user.datarouteruser.DatarouterUserDao;
@@ -59,13 +54,14 @@
 import io.datarouter.auth.web.config.routeset.DatarouterAccountRouteSet;
 import io.datarouter.auth.web.config.routeset.DatarouterAuthRouteSet;
 import io.datarouter.auth.web.config.routeset.DatarouterDocumentationRouteSet;
+import io.datarouter.auth.web.config.routeset.DatarouterRoleRequirementsRouteSet;
 import io.datarouter.auth.web.config.routeset.UserDeprovisioningRouteSet;
 import io.datarouter.auth.web.service.AccountCallerTypeRegistry2;
 import io.datarouter.auth.web.service.CopyUserListener;
 import io.datarouter.auth.web.service.CopyUserListener.DefaultCopyUserListener;
 import io.datarouter.auth.web.service.DatarouterAccountDailyDigest;
-import io.datarouter.auth.web.service.DatarouterAccountDeleteAction;
 import io.datarouter.auth.web.service.DatarouterDefaultAccountKeysDailyDigest;
+import io.datarouter.auth.web.service.DatarouterDefaultStaleAccountsDailyDigest;
 import io.datarouter.auth.web.service.DatarouterDefaultUserDailyDigest;
 import io.datarouter.auth.web.service.DatarouterPermissionRequestUserInfo;
 import io.datarouter.auth.web.service.DatarouterUserDeprovisioningStrategy;
@@ -96,7 +92,6 @@ public class DatarouterAuthPlugin extends BaseWebPlugin{
 	private final String defaultDatarouterUserPassword;
 	private final String defaultApiKey;
 	private final String defaultSecretKey;
-	private final Optional<Class<? extends DatarouterAccountDeleteAction>> datarouterAccountDeleteAction;
 	private final List<Class<? extends CallerType>> callerTypes2;
 
 	private DatarouterAuthPlugin(
@@ -107,15 +102,13 @@ private DatarouterAuthPlugin(
 			String defaultDatarouterUserPassword,
 			String defaultApiKey,
 			String defaultSecretKey,
-			Optional<Class<? extends DatarouterAccountDeleteAction>> datarouterAccountDeleteAction,
 			List<Class<? extends CallerType>> callerTypes2,
 			Map<PluginConfigKey<?>,Class<? extends PluginConfigValue<?>>> configs){
 		this.userDeprovisioningStrategyClass = userDeprovisioningStrategyClass;
 		this.copyUserListenerClass = copyUserListenerClass;
 		this.defaultDatarouterUserPassword = defaultDatarouterUserPassword;
 		this.defaultApiKey = defaultApiKey;
 		this.defaultSecretKey = defaultSecretKey;
-		this.datarouterAccountDeleteAction = datarouterAccountDeleteAction;
 		this.callerTypes2 = callerTypes2;
 
 		if(enableUserAuth){
@@ -139,24 +132,22 @@ private DatarouterAuthPlugin(
 		addRouteSet(DatarouterAccountRouteSet.class);
 		addRouteSet(DatarouterDocumentationRouteSet.class);
 		addRouteSet(UserDeprovisioningRouteSet.class);
+		addRouteSet(DatarouterRoleRequirementsRouteSet.class);
 		addSettingRoot(DatarouterAuthSettingRoot.class);
 		addPluginEntry(BaseTriggerGroup.KEY, DatarouterAuthTriggerGroup.class);
 		setDaosModule(daosModuleBuilder);
 		addDatarouterGithubDocLink("datarouter-auth-web");
 		addDailyDigest(PermissionRequestDailyDigest.class);
 		addDailyDigest(DatarouterAccountDailyDigest.class);
 		addDailyDigest(DatarouterDefaultAccountKeysDailyDigest.class);
+		addDailyDigest(DatarouterDefaultStaleAccountsDailyDigest.class);
 		addDailyDigest(DatarouterDefaultUserDailyDigest.class);
 		configs.forEach(this::addPluginEntry);
 	}
 
 	@Override
 	protected void configure(){
 		bindActual(BaseDatarouterSessionDao.class, DatarouterSessionDao.class);
-		bindActual(BaseDatarouterAccountDao.class, DatarouterAccountDao.class);
-		bindActual(BaseDatarouterAccountCredentialDao.class, DatarouterAccountCredentialDao.class);
-		bindActual(BaseDatarouterAccountSecretCredentialDao.class, DatarouterAccountSecretCredentialDao.class);
-		bindActual(BaseDatarouterAccountPermissionDao.class, DatarouterAccountPermissionDao.class);
 		bindActual(BaseDatarouterUserAccountMapDao.class, DatarouterUserAccountMapDao.class);
 		bindActual(BaseDatarouterSamlDao.class, DatarouterSamlDao.class);
 
@@ -166,7 +157,6 @@ protected void configure(){
 				new DefaultDatarouterUserPassword(defaultDatarouterUserPassword));
 		bindActualInstance(DefaultDatarouterAccountKeysSupplier.class,
 				new DefaultDatarouterAccountKeys(defaultApiKey, defaultSecretKey));
-		datarouterAccountDeleteAction.ifPresent(clazz -> bind(DatarouterAccountDeleteAction.class).to(clazz));
 		bindActualInstance(AccountCallerTypeRegistry2.class, new AccountCallerTypeRegistry2(callerTypes2));
 	}
 
@@ -183,8 +173,6 @@ public static class DatarouterAuthPluginBuilder{
 		private String defaultDatarouterUserPassword = "";
 		private String defaultApiKey = "";
 		private String defaultSecretKey = "";
-		private Optional<Class<? extends DatarouterAccountDeleteAction>> datarouterAccountDeleteAction = Optional
-				.empty();
 		private List<Class<? extends CallerType>> callerTypes2 = new ArrayList<>();
 
 		public DatarouterAuthPluginBuilder(
@@ -221,13 +209,6 @@ public DatarouterAuthPluginBuilder setCopyUserListenerClass(
 			return this;
 		}
 
-		// TODO delete?
-		public DatarouterAuthPluginBuilder setDatarouterAccountDeleteAction(
-				Class<? extends DatarouterAccountDeleteAction> datarouterAccountDeleteAction){
-			this.datarouterAccountDeleteAction = Optional.of(datarouterAccountDeleteAction);
-			return this;
-		}
-
 		public DatarouterAuthPluginBuilder setPermissionRequestUserInfo(
 				Class<? extends PermissionRequestUserInfo> permissionRequestUserInfo){
 			configs.put(PermissionRequestUserInfo.KEY, permissionRequestUserInfo);
@@ -259,7 +240,6 @@ public DatarouterAuthPlugin build(){
 					defaultDatarouterUserPassword,
 					defaultApiKey,
 					defaultSecretKey,
-					datarouterAccountDeleteAction,
 					callerTypes2,
 					configs);
 		}

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/routeset/DatarouterAccountRouteSet.java

@@ -16,7 +16,7 @@
 package io.datarouter.auth.web.config.routeset;
 
 import io.datarouter.auth.config.DatarouterAuthPaths;
-import io.datarouter.auth.role.DatarouterUserRole;
+import io.datarouter.auth.role.DatarouterUserRoleRegistry;
 import io.datarouter.auth.web.web.DatarouterAccountCallerTypeHandler;
 import io.datarouter.auth.web.web.DatarouterAccountManagerHandler;
 import io.datarouter.auth.web.web.DatarouterAccountRenameHandler;
@@ -39,7 +39,7 @@ public DatarouterAccountRouteSet(DatarouterAuthPaths paths){
 	@Override
 	protected DispatchRule applyDefault(DispatchRule rule){
 		return rule
-				.allowRoles(DatarouterUserRole.DATAROUTER_ACCOUNTS, DatarouterUserRole.DATAROUTER_ADMIN)
+				.allowRoles(DatarouterUserRoleRegistry.DATAROUTER_ACCOUNTS, DatarouterUserRoleRegistry.DATAROUTER_ADMIN)
 				.withTag(Tag.DATAROUTER);
 	}
 

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/routeset/DatarouterAuthRouteSet.java

@@ -16,7 +16,7 @@
 package io.datarouter.auth.web.config.routeset;
 
 import io.datarouter.auth.config.DatarouterAuthPaths;
-import io.datarouter.auth.role.DatarouterUserRole;
+import io.datarouter.auth.role.DatarouterUserRoleRegistry;
 import io.datarouter.auth.web.web.DatarouterPermissionRequestHandler;
 import io.datarouter.auth.web.web.DatarouterSigninHandler;
 import io.datarouter.auth.web.web.DatarouterSignoutHandler;
@@ -44,31 +44,34 @@ public DatarouterAuthRouteSet(DatarouterAuthPaths paths){
 		handle(paths.admin.createUser).withHandler(AdminEditUserHandler.class);
 		handle(paths.admin.createUserSubmit).withHandler(AdminEditUserHandler.class);
 		handle(paths.admin.editAccounts).withHandler(AdminEditUserHandler.class);
-		handle(paths.admin.editRoles).withHandler(AdminEditUserHandler.class).allowRoles(DatarouterUserRole.REQUESTOR);
-		handle(paths.admin.editUser).withHandler(AdminEditUserHandler.class).allowRoles(DatarouterUserRole.REQUESTOR);
+		handle(paths.admin.editRoles)
+				.withHandler(AdminEditUserHandler.class)
+				.allowRoles(DatarouterUserRoleRegistry.REQUESTOR);
+		handle(paths.admin.editUser).withHandler(AdminEditUserHandler.class)
+				.allowRoles(DatarouterUserRoleRegistry.REQUESTOR);
 		handle(paths.admin.getAllRoles).withHandler(AdminEditUserHandler.class)
-				.allowRoles(DatarouterUserRole.USER);
+				.allowRoles(DatarouterUserRoleRegistry.USER);
 		handle(paths.admin.getIsSamlEnabled).withHandler(AdminEditUserHandler.class);
 		handle(paths.admin.getUserDetails).withHandler(AdminEditUserHandler.class)
-				.allowRoles(DatarouterUserRole.REQUESTOR);
+				.allowRoles(DatarouterUserRoleRegistry.REQUESTOR);
 		handle(paths.admin.getUserProfileImage).withHandler(AdminEditUserHandler.class)
-				.allowRoles(DatarouterUserRole.REQUESTOR);
+				.allowRoles(DatarouterUserRoleRegistry.REQUESTOR);
 		handle(paths.admin.listUsers).withHandler(AdminEditUserHandler.class)
-				.allowRoles(DatarouterUserRole.USER);
+				.allowRoles(DatarouterUserRoleRegistry.USER);
 		handle(paths.admin.updatePassword).withHandler(AdminEditUserHandler.class);
 		handle(paths.admin.updateTimeZone).withHandler(AdminEditUserHandler.class);
 		handle(paths.admin.viewUsers).withHandler(AdminEditUserHandler.class)
-				.allowRoles(DatarouterUserRole.USER);
+				.allowRoles(DatarouterUserRoleRegistry.USER);
 
 		handleDir(paths.permissionRequest)
 				.withHandler(DatarouterPermissionRequestHandler.class)
-				.allowRoles(DatarouterUserRole.REQUESTOR);
+				.allowRoles(DatarouterUserRoleRegistry.REQUESTOR);
 	}
 
 	@Override
 	protected DispatchRule applyDefault(DispatchRule rule){
 		return rule
-				.allowRoles(DatarouterUserRole.ADMIN, DatarouterUserRole.DATAROUTER_ADMIN)
+				.allowRoles(DatarouterUserRoleRegistry.DATAROUTER_ADMIN)
 				.withTag(Tag.DATAROUTER);
 	}
 

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/routeset/DatarouterDocumentationRouteSet.java

@@ -16,7 +16,7 @@
 package io.datarouter.auth.web.config.routeset;
 
 import io.datarouter.auth.config.DatarouterAuthPaths;
-import io.datarouter.auth.role.DatarouterUserRole;
+import io.datarouter.auth.role.DatarouterUserRoleRegistry;
 import io.datarouter.auth.web.web.DatarouterDocumentationHandler;
 import io.datarouter.storage.tag.Tag;
 import io.datarouter.web.dispatcher.BaseRouteSet;
@@ -27,20 +27,20 @@
 @Singleton
 public class DatarouterDocumentationRouteSet extends BaseRouteSet{
 
-	@SuppressWarnings("deprecation")
 	@Inject
 	public DatarouterDocumentationRouteSet(DatarouterAuthPaths paths){
-		handleDir(paths.docs).withHandler(DatarouterDocumentationHandler.class);
+		handle(paths.docs).withHandler(DatarouterDocumentationHandler.class);
+		handle(paths.docs.getCsrfIv).withHandler(DatarouterDocumentationHandler.class);
+		handle(paths.docs.getSignature).withHandler(DatarouterDocumentationHandler.class);
 	}
 
 	@Override
 	protected DispatchRule applyDefault(DispatchRule rule){
 		return rule
 				.allowRoles(
-						DatarouterUserRole.ADMIN,
-						DatarouterUserRole.DATAROUTER_ADMIN,
-						DatarouterUserRole.DOC_USER,
-						DatarouterUserRole.USER)
+						DatarouterUserRoleRegistry.DATAROUTER_ADMIN,
+						DatarouterUserRoleRegistry.DOC_USER,
+						DatarouterUserRoleRegistry.USER)
 				.withTag(Tag.DATAROUTER);
 	}
 

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/routeset/DatarouterRoleRequirementsRouteSet.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2009 HotPads (admin@hotpads.com)
+ *
+ * Licensed 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.
+ */
+package io.datarouter.auth.web.config.routeset;
+
+import io.datarouter.auth.config.DatarouterAuthPaths;
+import io.datarouter.auth.role.DatarouterUserRoleRegistry;
+import io.datarouter.auth.web.web.DatarouterRoleRequirementHandler;
+import io.datarouter.storage.tag.Tag;
+import io.datarouter.web.dispatcher.BaseRouteSet;
+import io.datarouter.web.dispatcher.DispatchRule;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class DatarouterRoleRequirementsRouteSet extends BaseRouteSet{
+
+	@Inject
+	private DatarouterRoleRequirementsRouteSet(DatarouterAuthPaths paths){
+		handle(paths.datarouter.roleRequirements.getRequiredRolesByAfterContextPath)
+				.withHandler(DatarouterRoleRequirementHandler.class);
+	}
+
+	@Override
+	protected DispatchRule applyDefault(DispatchRule rule){
+		return rule
+				.allowRoles(DatarouterUserRoleRegistry.REQUESTOR)
+				.withTag(Tag.DATAROUTER);
+	}
+
+}