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

WIP: Add ModelMesh test for CVE-2024-7557 #1861

Open

rnetser wants to merge 43 commits into red-hat-data-services:master from rnetser:auth-multi-modes

+175 −81

Contributor

rnetser commented Sep 26, 2024

No description provided.

rnetser added 23 commits

September 18, 2024 17:18


          Add tests

8ce98fd


          add modelmesh tests

73b24a5

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

98c215d

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

8bb6f88

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

3f83bc6

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

a7121e4

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

b82028d

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

d5feec2

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

8000cbb

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

2c0720d

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

118abdd

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

cdbb779

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

f7d526c

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

4048abf

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

4409b52

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

1e8f59b

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

4c2a0fa

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

15c0e39

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

35fe0d1

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

62cb00e

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

db2230e

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

ccd8051

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add modelmesh tests

a8d618a

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems

View reviewed changes

github-advanced-security bot left a comment

Robocop found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Contributor

github-actions bot commented Sep 26, 2024

Robot Results

✅ Passed	❌ Failed	⏭️ Skipped	Total	Pass %
546	0	0	546	100

rnetser requested review from lugi0 and mwaykole

September 26, 2024 18:31

rnetser added 3 commits

September 29, 2024 09:28


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

09f70d0

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          resolve robocop comments

bcabc3c

Signed-off-by: rnetser <[email protected]>

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          fix comments

dba77d1

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          fix comments

aad7b58

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource Fixed Show fixed Hide fixed

ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot Fixed Show fixed Hide fixed

ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot Fixed Show fixed Hide fixed

ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot Fixed Show fixed Hide fixed

ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot Fixed Show fixed Hide fixed

ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot

                   # Even if kw fails, deleting the whole project will also delete the model
                   # Failure will be shown in the logs of the run nonetheless
                   IF    ${MODEL_CREATED}
                       Clean All Models Of Current User
                   ELSE
                       Log    Model not deployed, skipping deletion step during teardown    console=true
                   END
-                  ${projects}=    Create List    ${PRJ_TITLE}
+                  ${projects}=    Create List    ${project_name}

Check notice

Code scanning / Robocop

{{ create_keyword }} can be replaced with VAR Note test

Create List can be replaced with VAR

rnetser commented

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource Outdated Show resolved Hide resolved

mwaykole reviewed

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource

@@ @@ -218,7 +226,8 @@ Get Model Serving Access Token via UI @@
                       ${token}=    Get Single Model Token    ${service_account_name}
                   ELSE
                       SeleniumLibrary.Wait Until Page Contains Element    xpath://td[@data-label="Tokens"]/button
-                      SeleniumLibrary.Click Element    xpath://td[@data-label="Tokens"]/button
+                      SeleniumLibrary.Click Button
+                      ...    xpath://*[@id="expand-table-row-${model_name}-1-undefined-1"]/../../td[@data-label='Tokens']//button
                       ${token}=    SeleniumLibrary.Get Element Attribute
                       ...    xpath://div[.="${service_account_name} "]/../../td[@data-label="Token Secret"]//input    value

Member

mwaykole Sep 30, 2024

Xpath can be inproved

Contributor Author

rnetser Sep 30, 2024

@mwaykole please advise how

rnetser added 7 commits

September 30, 2024 08:06


          fix assign

a3b1727

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add runtime to token from ui

ad89501

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add runtime to token from ui

d7bfab1

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add runtime to token from ui

d4a4a38

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add runtime to token from ui

08f2918

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add runtime to token from ui

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          add runtime to token from ui

4f57e46

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource

@@ @@ -211,14 +219,28 @@ @@
               Get Model Serving Access Token via UI
                   [Documentation]    Returns the token used for authentication to the serving route
                   ...    TODO: There can be multiple tokens defined for each model server, handle this case as well
-                  [Arguments]    ${service_account_name}=default-name    ${single_model}=${FALSE}    ${model_name}=${NONE}
+                  [Arguments]    ${service_account_name}=default-name    ${single_model}=${FALSE}

Check notice

Code scanning / Robocop

There is too many arguments per continuation line ({{ arguments_count }} / {{ max_arguments_count }}) Note test

There is too many arguments per continuation line (2 / 1)

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource Dismissed Show dismissed Hide dismissed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource

		@@ -1,4 +1,4 @@
		# robocop: off=wrong-case-in-keyword-name,too-many-arguments,too-long-keyword
		# robocop: off=wrong-case-in-keyword-name,too-many-arguments,too-long-keyword,line-too-long

Check warning

Code scanning / Robocop

Inconsistent use of tabs and spaces in file Warning test

Inconsistent use of tabs and spaces in file

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource Fixed Show fixed Hide fixed

rnetser added 8 commits

September 30, 2024 18:32


          update paths in project

c3a830d

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

001b8c8

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          address robocop comments

2db9d62

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          fix ui

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

dfe44cb

 into auth-multi-modes

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          fix ui

846f459

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          update 2.13

78fe13f

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED


          update 2.13

2cfb81d

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource

@@ @@ -244,10 +228,12 @@ @@
               Get Access Token Via UI
                   [Documentation]    Returns the access token for models deployed in a specific project
                   ...    by using the UI of DSP
-                  [Arguments]    ${project_name}    ${service_account_name}=default-name    ${single_model}=${FALSE}
-                  ...            ${model_name}=${NONE}
+                  [Arguments]    ${project_name}    ${service_account_name}=default-name

Check notice

Code scanning / Robocop

There is too many arguments per continuation line ({{ arguments_count }} / {{ max_arguments_count }}) Note test

There is too many arguments per continuation line (2 / 1)

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource

-                  [Arguments]    ${project_name}    ${service_account_name}=default-name    ${single_model}=${FALSE}
-                  ...            ${model_name}=${NONE}
+                  [Arguments]    ${project_name}    ${service_account_name}=default-name
+                  ...    ${single_model}=${FALSE}    ${model_name}=${NONE}

Check notice

Code scanning / Robocop

There is too many arguments per continuation line ({{ arguments_count }} / {{ max_arguments_count }}) Note test

There is too many arguments per continuation line (2 / 1)


          update 2.13

6d29aef

rh-pre-commit.version: 2.3.1
rh-pre-commit.check-secrets: ENABLED

sonarcloud bot commented Oct 1, 2024

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

Member

mwaykole commented Oct 1, 2024

hey @rnetser u can add a label Product bug and mention RHOAIENG-12314 in the comment , i guess we can merge it after that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet