feat: Introduce "minimum supported Client version" configuration parameter for Server Proxy #1741
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…meter for Server Proxy Refs: XRDDEV-1999
andresrosenthal
force-pushed
the
XRDDEV-1999
branch
from
a17faec
to
000df85
Compare
Refs: XRDDEV-1999
Refs: XRDDEV-1999
Refs: XRDDEV-1999
Refs: XRDDEV-1999
enelir
approved these changes
Aug 25, 2023
Refs: XRDDEV-1999
andresrosenthal
commented
Aug 28, 2023
| import static ee.ria.xroad.common.ErrorCodes.X_CLIENT_PROXY_VERSION_NOT_SUPPORTED; | ||
|
|
||
| @Slf4j | ||
| public class ClientProxyVersionCheck { |
There was a problem hiding this comment.
Suggested change
| public class ClientProxyVersionCheck { | |
| public class ClientProxyVersionVerifier { |
| .orElse(null); | ||
| } | ||
|
|
||
| void check(HttpServletRequest request) { |
There was a problem hiding this comment.
As this class does seem like an utility class I think this method should should be made static.
Note that then there's no need to inject an instance of this class to ServerProxyHandler
|
|
||
| void check(HttpServletRequest request) { | ||
| String clientVersion = getVersion(request.getHeader(MimeUtils.HEADER_PROXY_VERSION)); | ||
| String thisVersion = getVersion(ProxyMain.readProxyVersion()); |
There was a problem hiding this comment.
This line could be moved to the line just before the if (!clientVersion.equals(thisVersion)) { check, where thisVersion variable is used for the first time.
| when(request.getHeader(MimeUtils.HEADER_PROXY_VERSION)).thenReturn(CLIENT_VERSION_6_26_3); | ||
| clientProxyVersionCheck = new ClientProxyVersionCheck(); | ||
|
|
||
| assertThrows(CodedException.class, () -> clientProxyVersionCheck.check(request)); |
There was a problem hiding this comment.
Could you please also assert exception's message?
Refs: XRDDEV-1999
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs: XRDDEV-1999