Skip to content

Hotfix #2514

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

Merged
constantine2nd merged 2 commits into from
Mar 20, 2025
Merged

Hotfix #2514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
930d043
bugfix/Check mandatory headers of Berlin Group 4
constantine2nd Mar 20, 2025
3e66f87
Merge remote-tracking branch 'upstream/develop' into develop
constantine2nd Mar 20, 2025
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
16 changes: 10 additions & 6 deletions obp-api/src/main/scala/code/api/util/BerlinGroupCheck.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ object BerlinGroupCheck {
}

def validate(body: Box[String], verb: String, url: String, reqHeaders: List[HTTPParam], forwardResult: (Box[User], Option[CallContext])): (Box[User], Option[CallContext]) = {
validateHeaders(verb, url, reqHeaders, forwardResult) match {
case (user, _) if user.isDefined || user == Empty => // All good. Chain another check
// Verify signed request (Berlin Group)
BerlinGroupSigning.verifySignedRequest(body, verb, url, reqHeaders, forwardResult)
case forwardError => // Forward error case
forwardError
if(url.contains("berlin-group")) {
validateHeaders(verb, url, reqHeaders, forwardResult) match {
case (user, _) if user.isDefined || user == Empty => // All good. Chain another check
// Verify signed request (Berlin Group)
BerlinGroupSigning.verifySignedRequest(body, verb, url, reqHeaders, forwardResult)
case forwardError => // Forward error case
forwardError
}
} else {
forwardResult
}
}

Expand Down
Loading