yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-02 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(frontend): Addressing minor issues (#6012)

Browse Source
This commit is contained in:
John Joyce 2022-09-21 14:21:55 -07:00 committed by GitHub
parent f00e1f4f2e
commit 2d29d0b121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
datahub-frontend/app/controllers/Application.java
View File

@ -120,7 +120,7 @@ public class Application extends Controller {
.entrySet()
.stream()
// Remove X-DataHub-Actor to prevent malicious delegation.
.filter(entry -> !AuthenticationConstants.LEGACY_X_DATAHUB_ACTOR_HEADER.equals(entry.getKey()))
.filter(entry -> !AuthenticationConstants.LEGACY_X_DATAHUB_ACTOR_HEADER.equalsIgnoreCase(entry.getKey()))
.filter(entry -> !Http.HeaderNames.CONTENT_LENGTH.equals(entry.getKey()))
.filter(entry -> !Http.HeaderNames.CONTENT_TYPE.equals(entry.getKey()))
.filter(entry -> !Http.HeaderNames.AUTHORIZATION.equals(entry.getKey()))
@ -305,7 +305,11 @@ public class Application extends Controller {
// Case 2: Map requests to /gms to / (Rest.li API)
final String gmsApiPath = "/api/gms";
if (path.startsWith(gmsApiPath)) {
return String.format("%s", path.substring(gmsApiPath.length()));
String newPath = path.substring(gmsApiPath.length());
if (!newPath.startsWith("/")) {
newPath = "/" + newPath;
}
return newPath;
}
// Otherwise, return original path

4
datahub-frontend/app/controllers/AuthenticationController.java
View File

@ -305,10 +305,10 @@ public class AuthenticationController extends Controller {
try {
_logger.debug("Attempting jaas authentication");
AuthenticationManager.authenticateJaasUser(username, password);
_logger.debug("Jaas authentication successful. Login succeeded");
loginSucceeded = true;
_logger.debug("Jaas authentication successful");
} catch (Exception e) {
_logger.debug("Jaas authentication error", e);
_logger.debug("Jaas authentication error. Login failed", e);
}
}

4
datahub-frontend/app/controllers/CentralLogoutController.java
View File

@ -41,7 +41,7 @@ public class CentralLogoutController extends LogoutController {
public Result executeLogout() throws ExecutionException, InterruptedException {
if (_isOidcEnabled) {
try {
return logout().toCompletableFuture().get();
return logout().toCompletableFuture().get().withNewSession();
} catch (Exception e) {
log.error("Caught exception while attempting to perform SSO logout! It's likely that SSO integration is mis-configured.", e);
return redirect(
@ -50,6 +50,6 @@ public class CentralLogoutController extends LogoutController {
+ "or refer to server logs for more information.")));
}
}
return redirect("/");
return redirect("/").withNewSession();
}
}

16
datahub-frontend/app/security/AuthenticationManager.java
View File

@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import java.util.Collections;
import javax.annotation.Nonnull;
import javax.naming.AuthenticationException;
import javax.naming.NamingException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
@ -23,21 +22,18 @@ public class AuthenticationManager {
}
public static void authenticateJaasUser(@Nonnull String userName, @Nonnull String password) throws NamingException {
public static void authenticateJaasUser(@Nonnull String userName, @Nonnull String password) throws Exception {
Preconditions.checkArgument(!StringUtils.isAnyEmpty(userName), "Username cannot be empty");
JAASLoginService jaasLoginService = new JAASLoginService("WHZ-Authentication");
PropertyUserStoreManager propertyUserStoreManager = new PropertyUserStoreManager();
propertyUserStoreManager.start();
jaasLoginService.setBeans(Collections.singletonList(propertyUserStoreManager));
JAASLoginService.INSTANCE.set(jaasLoginService);
try {
JAASLoginService jaasLoginService = new JAASLoginService("WHZ-Authentication");
PropertyUserStoreManager propertyUserStoreManager = new PropertyUserStoreManager();
propertyUserStoreManager.start();
jaasLoginService.setBeans(Collections.singletonList(propertyUserStoreManager));
JAASLoginService.INSTANCE.set(jaasLoginService);
LoginContext lc = new LoginContext("WHZ-Authentication", new WHZCallbackHandler(userName, password));
lc.login();
} catch (LoginException le) {
throw new AuthenticationException(le.toString());
} catch (Exception e) {
// Bad abstract class design, empty doStart that has throws Exception in the signature and subclass that also
// does not throw any checked exceptions. This should never happen, all it does is create an empty HashMap...
}
}