Skip to content

Commit 7d70ef5

Browse files
thisaltennakoonthisaltennakoon
authored
Add configs for trust store support for token endpoint connection in OAuth protected endpoints (#13857)
* Add configs for external trust store support for token endpoint connection in OAuth protected endpoints * Changed ExternalTrustStoreConfigs to TrustStoreConfigs * Bump synapse version
1 parent 48cdaab commit 7d70ef5

File tree

8 files changed

+40
-4
lines changed

8 files changed

+40
-4
lines changed

‎all-in-one-apim/modules/distribution/product/src/main/resources/conf/templates/repository/conf/synapse.properties.j2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,13 @@ synapse.endpoint.http.oauth.token.endpoint.global.proxy.username={{apim.proxy_co
4343
synapse.endpoint.http.oauth.token.endpoint.global.proxy.password={{apim.proxy_config.password}}
4444
synapse.endpoint.http.oauth.token.endpoint.global.proxy.protocol={{apim.proxy_config.protocol}}
4545
{% endif %}
46+
{% if apim.mediator_config.oauth.trust_store.location is defined %}
47+
synapse.endpoint.http.oauth.token.endpoint.trust.store.location={{apim.mediator_config.oauth.trust_store.location}}
48+
{% endif %}
49+
{% if apim.mediator_config.oauth.trust_store.type is defined %}
50+
synapse.endpoint.http.oauth.token.endpoint.trust.store.type={{apim.mediator_config.oauth.trust_store.type}}
51+
{% endif %}
52+
{% if apim.mediator_config.oauth.trust_store.password is defined %}
53+
synapse.endpoint.http.oauth.token.endpoint.trust.store.password={{apim.mediator_config.oauth.trust_store.password}}
54+
{% endif %}
4655
{% endif %}

‎all-in-one-apim/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@
13751375
<opencsv.version>1.8</opencsv.version>
13761376
<poi.version>3.0-FINAL</poi.version>
13771377
<woden.version>1.0.0.M8-wso2v1</woden.version>
1378-
<synapse.version>4.0.0-wso2v245</synapse.version>
1378+
<synapse.version>4.0.0-wso2v249</synapse.version>
13791379
<passthru.transport.patch.version>1.0.2</passthru.transport.patch.version>
13801380
<axis2.wso2.version>1.6.1-wso2v105</axis2.wso2.version>
13811381
<axiom.wso2.version>1.2.11-wso2v29</axiom.wso2.version>

‎api-control-plane/modules/distribution/product/src/main/resources/conf/templates/repository/conf/synapse.properties.j2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,13 @@ synapse.endpoint.http.oauth.token.endpoint.global.proxy.username={{apim.proxy_co
4343
synapse.endpoint.http.oauth.token.endpoint.global.proxy.password={{apim.proxy_config.password}}
4444
synapse.endpoint.http.oauth.token.endpoint.global.proxy.protocol={{apim.proxy_config.protocol}}
4545
{% endif %}
46+
{% if apim.mediator_config.oauth.trust_store.location is defined %}
47+
synapse.endpoint.http.oauth.token.endpoint.trust.store.location={{apim.mediator_config.oauth.trust_store.location}}
48+
{% endif %}
49+
{% if apim.mediator_config.oauth.trust_store.type is defined %}
50+
synapse.endpoint.http.oauth.token.endpoint.trust.store.type={{apim.mediator_config.oauth.trust_store.type}}
51+
{% endif %}
52+
{% if apim.mediator_config.oauth.trust_store.password is defined %}
53+
synapse.endpoint.http.oauth.token.endpoint.trust.store.password={{apim.mediator_config.oauth.trust_store.password}}
54+
{% endif %}
4655
{% endif %}

‎api-control-plane/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@
13541354
<opencsv.version>1.8</opencsv.version>
13551355
<poi.version>3.0-FINAL</poi.version>
13561356
<woden.version>1.0.0.M8-wso2v1</woden.version>
1357-
<synapse.version>4.0.0-wso2v245</synapse.version>
1357+
<synapse.version>4.0.0-wso2v249</synapse.version>
13581358
<passthru.transport.patch.version>1.0.2</passthru.transport.patch.version>
13591359
<axis2.wso2.version>1.6.1-wso2v105</axis2.wso2.version>
13601360
<axiom.wso2.version>1.2.11-wso2v29</axiom.wso2.version>

‎gateway/modules/distribution/product/src/main/resources/conf/templates/repository/conf/synapse.properties.j2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,13 @@ synapse.endpoint.http.oauth.token.endpoint.global.proxy.username={{apim.proxy_co
4343
synapse.endpoint.http.oauth.token.endpoint.global.proxy.password={{apim.proxy_config.password}}
4444
synapse.endpoint.http.oauth.token.endpoint.global.proxy.protocol={{apim.proxy_config.protocol}}
4545
{% endif %}
46+
{% if apim.mediator_config.oauth.trust_store.location is defined %}
47+
synapse.endpoint.http.oauth.token.endpoint.trust.store.location={{apim.mediator_config.oauth.trust_store.location}}
48+
{% endif %}
49+
{% if apim.mediator_config.oauth.trust_store.type is defined %}
50+
synapse.endpoint.http.oauth.token.endpoint.trust.store.type={{apim.mediator_config.oauth.trust_store.type}}
51+
{% endif %}
52+
{% if apim.mediator_config.oauth.trust_store.password is defined %}
53+
synapse.endpoint.http.oauth.token.endpoint.trust.store.password={{apim.mediator_config.oauth.trust_store.password}}
54+
{% endif %}
4655
{% endif %}

‎gateway/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@
13541354
<opencsv.version>1.8</opencsv.version>
13551355
<poi.version>3.0-FINAL</poi.version>
13561356
<woden.version>1.0.0.M8-wso2v1</woden.version>
1357-
<synapse.version>4.0.0-wso2v245</synapse.version>
1357+
<synapse.version>4.0.0-wso2v249</synapse.version>
13581358
<passthru.transport.patch.version>1.0.2</passthru.transport.patch.version>
13591359
<axis2.wso2.version>1.6.1-wso2v105</axis2.wso2.version>
13601360
<axiom.wso2.version>1.2.11-wso2v29</axiom.wso2.version>

‎traffic-manager/modules/distribution/product/src/main/resources/conf/templates/repository/conf/synapse.properties.j2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,13 @@ synapse.endpoint.http.oauth.token.endpoint.global.proxy.username={{apim.proxy_co
4343
synapse.endpoint.http.oauth.token.endpoint.global.proxy.password={{apim.proxy_config.password}}
4444
synapse.endpoint.http.oauth.token.endpoint.global.proxy.protocol={{apim.proxy_config.protocol}}
4545
{% endif %}
46+
{% if apim.mediator_config.oauth.trust_store.location is defined %}
47+
synapse.endpoint.http.oauth.token.endpoint.trust.store.location={{apim.mediator_config.oauth.trust_store.location}}
48+
{% endif %}
49+
{% if apim.mediator_config.oauth.trust_store.type is defined %}
50+
synapse.endpoint.http.oauth.token.endpoint.trust.store.type={{apim.mediator_config.oauth.trust_store.type}}
51+
{% endif %}
52+
{% if apim.mediator_config.oauth.trust_store.password is defined %}
53+
synapse.endpoint.http.oauth.token.endpoint.trust.store.password={{apim.mediator_config.oauth.trust_store.password}}
54+
{% endif %}
4655
{% endif %}

‎traffic-manager/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@
13541354
<opencsv.version>1.8</opencsv.version>
13551355
<poi.version>3.0-FINAL</poi.version>
13561356
<woden.version>1.0.0.M8-wso2v1</woden.version>
1357-
<synapse.version>4.0.0-wso2v245</synapse.version>
1357+
<synapse.version>4.0.0-wso2v249</synapse.version>
13581358
<passthru.transport.patch.version>1.0.2</passthru.transport.patch.version>
13591359
<axis2.wso2.version>1.6.1-wso2v105</axis2.wso2.version>
13601360
<axiom.wso2.version>1.2.11-wso2v29</axiom.wso2.version>

0 commit comments

Comments
 (0)