Skip to content

re-arranged filter order #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheLonelyKiwi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

re-arranged filter order #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/kotlin/com/scrumdapp/gateway/configuration/GatewayConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class GatewayConfig {

val routes: RouterFunction<ServerResponse> =
route()
.filter(passportInvalidationFilter.invalidatePassport())
.filter(utilFilters.blockActuatorRequests())
.filter(passportFilters.insertPassport())

Expand All @@ -47,19 +48,16 @@ class GatewayConfig {
)
.add(route("groups")
.route(path("/api/groups/**"), http())
.filter(passportInvalidationFilter.invalidatePassport())
.before(uri(services.getUrl("groups")))
.build()
)
.add(route("users")
.route(path("api/users/**"), http())
.filter(passportInvalidationFilter.invalidatePassport())
.before(uri(services.getUrl("users")))
.build()
)
.add(route("invites")
.route(path("api/invites/**"), http())
.filter(passportInvalidationFilter.invalidatePassport())
.before(uri(services.getUrl("invites")))
.build()
)
Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/com/scrumdapp/gateway/passports/PassportFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ class PassportFilters(
return HandlerFilterFunction { req: ServerRequest, next: HandlerFunction<ServerResponse> ->
val session = req.session() ?: return@HandlerFilterFunction next.handle(req)

var cachedToken = session.getAttribute("JWT_AC_TOKEN") as? PassportToken
var cachedToken = session.getAttribute("PASSPORT") as? PassportToken

val userId = session.getAttribute("userId") as? Long ?: throw NotAuthorizedException(message = "Unauthorized, please log in again")

if (cachedToken == null || cachedToken.isExpired()) {
cachedToken = passportService.generatePassport(userId)
session.setAttribute("JWT_AC_TOKEN", cachedToken)
session.setAttribute("PASSPORT", cachedToken)
}

val mutatedReq = ServerRequest.from(req)
Expand Down
4 changes: 1 addition & 3 deletions src/main/kotlin/com/scrumdapp/gateway/passports/PassportInvalidationFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ class PassportInvalidationFilter(
fun invalidatePassport(): HandlerFilterFunction<ServerResponse, ServerResponse> {

return HandlerFilterFunction { req: ServerRequest, next: HandlerFunction<ServerResponse> ->

val res = next.handle(req)
val session = req.session() ?: return@HandlerFilterFunction res

if (passportRevokePaths.containsKey(req.path()) && passportRevokePaths[req.path()]?.contains(req.method()) == true) {
session.removeAttribute("JWT_AC_TOKEN")
session.removeAttribute("PASSPORT")
}

res
}
}
Expand Down