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

Add Integration Test for Lightweight API Key and Fix WebSocket API Invocation Test Issues #13531

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Add Integration Test for Lightweight API Key and Fix WebSocket API Invocation Test Issues #13531

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
da991fc
Add enable_lightweight_apikey_generation config to the deployment.toml
dakshina99 Sep 7, 2024
1348753
Run APISecurityTestCase with and without enabling lightweight Api key
dakshina99 Sep 7, 2024
bdb8c2f
Fix issues in WebSocketAPITestCases
dakshina99 Sep 17, 2024
861ecdc
Merge branch 'wso2:master' into lightweight_apikey
dakshina99 Sep 17, 2024
12df6f5
change the test block for APISecurityTestCase
dakshina99 Sep 18, 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 modules/distribution/product/src/main/conf/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ enable = true
token = ""

[apim.key_manager]
enable_apikey_subscription_validation = true
enable_lightweight_apikey_generation = true
#service_url = "https://localhost:${mgt.transport.https.port}/services/"
#username = "$ref{super_admin.username}"
#password = "$ref{super_admin.password}"
Expand Down
2 changes: 2 additions & 0 deletions ...s-backend/src/test/java/org/wso2/am/integration/tests/websocket/WebSocketAPITestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,11 @@ private void invokeAPI(WebSocketClient client, String accessToken, AUTH_IN in, H
} else if (AUTH_IN.OAUTH_QUERY == in) {
echoUri = new URI(apiEndPoint + "?access_token=" + accessToken);
} else if (AUTH_IN.APIKEY_HEADER == in) {
Thread.sleep(24000);
request.setHeader("apikey", accessToken);
echoUri = new URI(apiEndPoint);
} else if (AUTH_IN.APIKEY_QUERY == in) {
Thread.sleep(24000);
echoUri = new URI(apiEndPoint + "?apikey=" + accessToken);
}

Expand Down
3 changes: 3 additions & 0 deletions ...egration/tests-backend/src/test/resources/artifacts/AM/configFiles/common/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ password = "wso2carbon"
alias = "wso2carbon"
key_password = "wso2carbon"

[apim.key_manager]
enable_lightweight_apikey_generation = false

[[apim.gateway.environment]]
name = "Default"
type = "hybrid"
Expand Down
3 changes: 1 addition & 2 deletions modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@
<parameter name="group" value="group4"/>
<classes>
<class name="org.wso2.am.integration.tests.other.AdvancedConfigDeploymentConfig"/>
<class name="org.wso2.am.integration.tests.api.lifecycle.APISecurityTestCase" />
<class name="org.wso2.am.integration.tests.other.NotificationTestCase"/>
<class name="org.wso2.am.integration.tests.json.ESBJAVA3380TestCase"/>
<!--THis test will be enabled once the stats event streams are finalized -->
Expand All @@ -369,8 +370,6 @@
</classes>
</test>



<test name="apim-integration-tests-application-sharing" preserve-order="true" parallel="false" group-by-instances="true">
<parameter name="group" value="group1"/>
<classes>
Expand Down
Loading