Skip to content

[ELYEE-66] Rework the forking of Soteria code.#53

Merged
darranl merged 1 commit intowildfly-security:3.1.xfrom
darranl:ELYEE-66
Feb 25, 2025
Merged

[ELYEE-66] Rework the forking of Soteria code.#53
darranl merged 1 commit intowildfly-security:3.1.xfrom
darranl:ELYEE-66

Conversation

@darranl
Copy link
Contributor

@darranl darranl commented Feb 24, 2025

https://issues.redhat.com/browse/ELYEE-66

Some additional classes needed to be imported, additionally classes that had been imported needed imports adjusting to use the other imported classes, finally Soteria formatting has been left in place to make it easier to compere with version 3.1.1.Final

@darranl
Copy link
Contributor Author

darranl commented Feb 24, 2025

@jamezp Farah is not available to ACK - are you able to give a quick ACK so I can tag again, I have more tests passing locally now.

Copy link
Contributor

@jamezp jamezp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have my laptop today as I'm on PTO, but I checked on my phone and it seemed okay. I assume this must just be some copy/paste changes which looks fine. It seems to be mostly format changes. There are some removal of final qualifiers that seems odd, but if it's just copy/paste changes that seems fine.

}

private String getFullURL(HttpServletRequest request) {
private String getFullURL(HttpServletRequest request) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't block anything, but looks like just a white space change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you, I have resisted formatting updates this time other than as needed to get past checkstyle as it make it hard to compare this forked code with the original - Soteria has some bad formatting like this.

import java.io.Serializable;
import java.security.Principal;

import javax.security.auth.callback.Callback;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file seems like just format changes too.

@darranl
Copy link
Contributor Author

darranl commented Feb 24, 2025

Thank you, I am running a local all tests build to double check and will merge and tag in the morning. Apart from where I needed to tweak some imports this is a copy and paste from Soteria.

Once we get to Soteria 4 for EE 11 we will not need the forked code as there is a mechanism there to add our integration directly.

@darranl darranl changed the base branch from 3.x to 3.1.x February 25, 2025 15:40
@darranl darranl merged commit 2269fd9 into wildfly-security:3.1.x Feb 25, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants