Skip to content
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

Jump to bottom

fix: move security configuration back to gateway section #3775

Merged
merged 5 commits into from
Sep 17, 2024
Merged

fix: move security configuration back to gateway section #3775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d56e962
fix: move security configuration back to gateway section for backward…
achmelo Sep 17, 2024
9c63977
change default zaas port
achmelo Sep 17, 2024
63d4b0f
Merge branch 'v3.x.x' into reboot/gw-zaas-conf
achmelo Sep 17, 2024
5f01657
do not log spring beans
achmelo Sep 17, 2024
7fea908
Merge remote-tracking branch 'origin/reboot/gw-zaas-conf' into reboot…
achmelo Sep 17, 2024
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
2 changes: 1 addition & 1 deletion containers/zaas-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ COPY --chown=zowe:zowe component/LICENSE /licenses

##################################
# start command
EXPOSE 7563
EXPOSE 7558
ENTRYPOINT [ "bin/start.sh" ]
48 changes: 44 additions & 4 deletions gateway-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,50 @@ apimlServices:
dynamic:
- serviceId: gateway
configs:
port: 7563
port: 7554
debug: false
sslDebug: ""
apimlId:
apiml:
service:
# Enables forwarding client certificate from request to next gateway in a special request header
forwardClientCertEnabled: false
service:
# Enables forwarding client certificate from request to next gateway in a special request header
forwardClientCertEnabled: false
security:
auth:
provider: zosmf
zosmf:
jwtAutoconfiguration: jwt
serviceId: ibmzosmf
authorization:
endpoint:
enabled: false
# default value is https://${ZWE_haInstance_hostname:-localhost}:${ZWE_configs_port}/zss/api/v1/saf-auth
url:
provider: ""
resourceClass: ZOWE
resourceNamePrefix: "APIML."
x509:
enabled: false
# default value is https://${ZWE_haInstance_hostname:-localhost}:${ZWE_configs_port}/zss/api/v1/certificate/x509/map
externalMapperUrl:
# default value is Zowe runtime user defined in zowe.yaml "zowe.setup.security.users.zowe"
externalMapperUser:
# Enables consumption of forwarded client certificate from proxy gateway in a special request header
acceptForwardedCert: true
oidc:
enabled: false
clientId:
clientSecret:
registry:
# default value is https://${ZWE_haInstance_hostname:-localhost}:${ZWE_configs_port}/zss/api/v1/certificate/dn
identityMapperUrl:
# default value is Zowe runtime user defined in zowe.yaml "zowe.setup.security.users.zowe"
identityMapperUser:
saf:
provider:
urls:
authenticate:
verify:
server:
maxConnectionsPerRoute: 100
maxTotalConnections: 1000
1 change: 1 addition & 0 deletions gateway-service/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ logging:
org.springframework.cloud.gateway.filter: WARN
org.springframework.cloud.gateway.route: WARN
org.springframework.context.support: WARN
org.springframework.beans: WARN
reactor.netty.http.client: INFO
reactor.netty.http.client.HttpClientConnect: OFF
javax.net.ssl: ERROR
Expand Down
1 change: 1 addition & 0 deletions gateway-service/src/test/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ logging:
org.springframework.cloud.gateway: DEBUG
reactor.netty: DEBUG
org.springframework.security: DEBUG
org.springframework.beans: WARN


management:
Expand Down
2 changes: 1 addition & 1 deletion schemas/zaas-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"properties": {
"port": {
"$ref": "#/$defs/port",
"default": 7563
"default": 7558
},
"debug": {
"type": "boolean",
Expand Down
42 changes: 1 addition & 41 deletions zaas-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,52 +29,12 @@ apimlServices:
dynamic:
- serviceId: zaas
configs:
port: 7554
port: 7558
debug: false
sslDebug: ""
apimlId:

apiml:
security:
auth:
provider: zosmf
zosmf:
jwtAutoconfiguration: auto
serviceId: ibmzosmf
authorization:
endpoint:
enabled: false
# default value is https://${ZWE_haInstance_hostname:-localhost}:${ZWE_configs_port}/zss/api/v1/saf-auth
url:
provider: ""
resourceClass: ZOWE
resourceNamePrefix: "APIML."
x509:
enabled: false
# default value is https://${ZWE_haInstance_hostname:-localhost}:${ZWE_configs_port}/zss/api/v1/certificate/x509/map
externalMapperUrl:
# default value is Zowe runtime user defined in zowe.yaml "zowe.setup.security.users.zowe"
externalMapperUser:
# Enables consumption of forwarded client certificate from proxy gateway in a special request header
acceptForwardedCert: true
oidc:
enabled: false
clientId:
clientSecret:
registry:
# default value is https://${ZWE_haInstance_hostname:-localhost}:${ZWE_configs_port}/zss/api/v1/certificate/dn
identityMapperUrl:
# default value is Zowe runtime user defined in zowe.yaml "zowe.setup.security.users.zowe"
identityMapperUser:
saf:
provider:
urls:
authenticate:
verify:

server:
maxConnectionsPerRoute: 100
maxTotalConnections: 1000
ssl:
enabled: true

Expand Down
Loading