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-11369] Additional authentication options for cascaded WMS|WMTS data stores #7552
Conversation
Tests are failing because it relies on GeoTools PR to be committed first |
This comment was marked as resolved.
This comment was marked as resolved.
src/main/src/main/java/org/geoserver/security/decorators/DecoratingWMSStoreInfo.java
Outdated
Show resolved
Hide resolved
|
src/main/src/main/java/org/geoserver/catalog/impl/WMTSStoreInfoImpl.java
Show resolved
Hide resolved
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.
This PR looks good thank you for the improvement :)
I have a question about a single header name / value pair being supported; it seems inconsistent with code comments.
…Server) to append additional querystring parameters e.g. AuthKey to every request made by the HTTPClient (#4727) * To support HTTP Headers see github.com/geoserver/geoserver/pull/7552 * Add AuthKey by appending to URL in HTTPClient * Undo test version in pom files * Fix SimpleHTTPClient * Add test cases * Fix review issues with URL * URL Host not Authority * Change AuthKey -> ExtraParams and from String to Map * URL encode keys and values and build a test that verifies this * Update modules/extension/wms/src/main/java/org/geotools/ows/wms/WebMapServer.java Improve grammar Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Update modules/library/http/src/main/java/org/geotools/http/HTTPClient.java Improve docs Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Petersmythe map string object (#2) Replace Map<String, Object> * Change null to emptyMap, add duplicate key check * Oops, when applying patch * Fix integer test * Fix spelling * To support HTTP Headers see github.com/geoserver/geoserver/pull/7552 * Add AuthKey by appending to URL in HTTPClient * Undo test version in pom files * Fix SimpleHTTPClient * Add test cases * Fix review issues with URL * URL Host not Authority * Change AuthKey -> ExtraParams and from String to Map * URL encode keys and values and build a test that verifies this * Update modules/extension/wms/src/main/java/org/geotools/ows/wms/WebMapServer.java Improve grammar Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Update modules/library/http/src/main/java/org/geotools/http/HTTPClient.java Improve docs Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Petersmythe map string object (#2) Replace Map<String, Object> * Change null to emptyMap, add duplicate key check * Oops, when applying patch * Fix integer test * Fix spelling --------- Co-authored-by: Peter Smythe <peter@afrigis.co.za> Co-authored-by: Jody Garnett <jody.garnett@gmail.com>
Merging with geotools/geotools#4727 |
Merging, the lack of coordination between geotools and GeoServer is breaking several builds and workflows (two people already mentioned it to me). When you do coordinates PRs, please make sure to merge them toghether. |
FYI, this PR is failing the QA build:
|
Fixed now with #7589 |
…Server) to append additional querystring parameters e.g. AuthKey to every request made by the HTTPClient (#4727) * To support HTTP Headers see github.com/geoserver/geoserver/pull/7552 * Add AuthKey by appending to URL in HTTPClient * Undo test version in pom files * Fix SimpleHTTPClient * Add test cases * Fix review issues with URL * URL Host not Authority * Change AuthKey -> ExtraParams and from String to Map * URL encode keys and values and build a test that verifies this * Update modules/extension/wms/src/main/java/org/geotools/ows/wms/WebMapServer.java Improve grammar Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Update modules/library/http/src/main/java/org/geotools/http/HTTPClient.java Improve docs Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Petersmythe map string object (#2) Replace Map<String, Object> * Change null to emptyMap, add duplicate key check * Oops, when applying patch * Fix integer test * Fix spelling * To support HTTP Headers see github.com/geoserver/geoserver/pull/7552 * Add AuthKey by appending to URL in HTTPClient * Undo test version in pom files * Fix SimpleHTTPClient * Add test cases * Fix review issues with URL * URL Host not Authority * Change AuthKey -> ExtraParams and from String to Map * URL encode keys and values and build a test that verifies this * Update modules/extension/wms/src/main/java/org/geotools/ows/wms/WebMapServer.java Improve grammar Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Update modules/library/http/src/main/java/org/geotools/http/HTTPClient.java Improve docs Co-authored-by: Jody Garnett <jody.garnett@gmail.com> * Petersmythe map string object (#2) Replace Map<String, Object> * Change null to emptyMap, add duplicate key check * Oops, when applying patch * Fix integer test * Fix spelling --------- Co-authored-by: Peter Smythe <peter@afrigis.co.za> Co-authored-by: Jody Garnett <jody.garnett@gmail.com>
…Server) to append additional querystring parameters e.g. AuthKey to every request made by the HTTPClient (#4727) (#4735) * To support HTTP Headers see github.com/geoserver/geoserver/pull/7552 * Add AuthKey by appending to URL in HTTPClient * Undo test version in pom files * Fix SimpleHTTPClient * Add test cases * Fix review issues with URL * URL Host not Authority * Change AuthKey -> ExtraParams and from String to Map * URL encode keys and values and build a test that verifies this * Update modules/extension/wms/src/main/java/org/geotools/ows/wms/WebMapServer.java Improve grammar * Update modules/library/http/src/main/java/org/geotools/http/HTTPClient.java Improve docs * Petersmythe map string object (#2) Replace Map<String, Object> * Change null to emptyMap, add duplicate key check * Oops, when applying patch * Fix integer test * Fix spelling * To support HTTP Headers see github.com/geoserver/geoserver/pull/7552 * Add AuthKey by appending to URL in HTTPClient * Undo test version in pom files * Fix SimpleHTTPClient * Add test cases * Fix review issues with URL * URL Host not Authority * Change AuthKey -> ExtraParams and from String to Map * URL encode keys and values and build a test that verifies this * Update modules/extension/wms/src/main/java/org/geotools/ows/wms/WebMapServer.java Improve grammar * Update modules/library/http/src/main/java/org/geotools/http/HTTPClient.java Improve docs * Petersmythe map string object (#2) Replace Map<String, Object> * Change null to emptyMap, add duplicate key check * Oops, when applying patch * Fix integer test * Fix spelling --------- Co-authored-by: Peter Smythe <peter@afrigis.co.za> Co-authored-by: Jody Garnett <jody.garnett@gmail.com>
Unlike cascaded WMTS stores, WMS stores do not have the option to pass an HTTP header along with the request (for authentication purposes):
This PR, in conjunction with GeoTools PR, fixes that.
I am also considering another field for a querystring API key/authkey, for both WMS and WMTS stores.
Related
This PR is to be merged concurrently with:
Checklist
main
branch (backports managed later; ignore for branch specific issues).For core and extension modules:
[GEOS-XYZWV] Title of the Jira ticket
.