-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
[GEOS-11352] REST service for URL checks #7582
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The general infrastructure looks ok, but there is a fundamental API breakage in this PR that needs to be reverted.
src/main/src/main/java/org/geoserver/config/util/XStreamPersister.java
Outdated
Show resolved
Hide resolved
src/main/src/main/java/org/geoserver/security/urlchecks/AbstractURLCheck.java
Outdated
Show resolved
Hide resolved
src/main/src/main/java/org/geoserver/security/urlchecks/AbstractURLCheck.java
Outdated
Show resolved
Hide resolved
src/rest/src/main/java/org/geoserver/rest/RestControllerAdvice.java
Outdated
Show resolved
Hide resolved
src/restconfig/src/main/java/org/geoserver/rest/security/UrlCheckController.java
Outdated
Show resolved
Hide resolved
src/restconfig/src/main/java/org/geoserver/rest/security/UrlCheckController.java
Show resolved
Hide resolved
src/restconfig/src/test/java/org/geoserver/rest/security/UrlCheckControllerTest.java
Show resolved
Hide resolved
<execution> | ||
<id>generate-urlchecks-api</id> | ||
<goals> | ||
<goal>generate</goal> | ||
</goals> | ||
<configuration> | ||
<generatorName>java</generatorName> | ||
<inputSpec>${openapi-base-folder}/urlchecks.yaml</inputSpec> | ||
<configurationFile>${project.basedir}/client-api-config.json</configurationFile> | ||
<generateSupportingFiles>false</generateSupportingFiles> | ||
<generateModelTests>false</generateModelTests> | ||
<generateApiTests>false</generateApiTests> | ||
<generateApiDocumentation>false</generateApiDocumentation> | ||
<generateModelDocumentation>false</generateModelDocumentation> | ||
</configuration> | ||
</execution> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@groldan you're the maintainer of the rest-openapi module. Does this change look legit to you?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thanks.
Does this need to be backported? Normally we'd wait a month to perform backport of new functionality, but this is pretty much self contained, and should not cause any issue. But you'll need to ask about it on geoserver-devel. |
The backport to
stderr
stdout
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.25.x 2.25.x
# Navigate to the new working tree
cd .worktrees/backport-2.25.x
# Create a new branch
git switch --create backport-7582-to-2.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 642a8a0691c88b2134700167e5c902ce77d57b45,447b9ae038e16305e991547c7787e970e3cce5bb,0834a1d558b5922faf0b6f286fe62e799231e224,817e1d8d14280db5d7389bcfdd6518b4008e4701,94c5de70c2d296ff90e08fc7f18f40793ae18458,aa0fbb2af3e69be25487ba7ca57c2e9628e8fb3d,64e644567d3a17f5987960d027484d172897f6c3,67bed79220912be08e2a5c606cc8a9cb2b63bab4,23413d4e29d37b3025d44134202b6da6ef0bf89e,b2a46746893ac107e1adf89f6249e590f1733e27,4621a71a99d695c9f3a1339c7c1381ac917504ce,48acf4b11593f151a5bbe0125c8d7671ae9d40ca,ab2ef8ac929881ade741acafcbf7c5c7e63dd90c,bc87d1d3ef1b4b08d0ab380ae893e06d478b1626,fd6b583d1d6d5199f39e4a85cccc39225e087cc7,32869eac17f20f5672fa7acc152ff793c6867dfd
# Push it to GitHub
git push --set-upstream origin backport-7582-to-2.25.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.25.x Then, create a pull request where the |
* [GEOS-11352] Added REST controller to handle URL checks. * [GEOS-11352] Moved UrlCheckController in the right package. * [GEOS-11352] Revised templates for URL check HTML rendering. * [GEOS-11352] Added test for UrlCheckController. * [GEOS-11352] Cosmetic fixes. * [GEOS-11352] Added documentation for the URL check REST endpoints. * [GEOS-11352] Removed unnecessary change. * [GEOS-11352] Refactored HTTP POST response headers composition. * [GEOS-11352] Reverted changes to url check enabled status field type. * [GEOS-11352] Removed stray todo. * [GEOS-11352] Revised url check controller. * [GEOS-11352] Revised tests. * [GEOS-11352] Updated documentation. * [GEOS-11352] Updated rest-openapi documentation.
Adding a REST service to manage URL checks would be potentially beneficial to those users who want to use automated tools to set URL rules for external access in their GeoServer instances.
Checklist
main
branch (backports managed later; ignore for branch specific issues).For core and extension modules:
[GEOS-XYZWV] Title of the Jira ticket
.