yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-07-25 18:30:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Null Check for isAdmin (#16407)

Browse Source 
* Remove Retry From Abstract Event Consumer

* - Add Check for null Or Empty in isAdmin

* - Fix Test
This commit is contained in:
Mohit Yadav 2024-05-24 15:58:41 +05:30 committed by GitHub
parent 7959e2502e
commit fe2db2d63c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openmetadata-service/src/main/java/org/openmetadata/service/security/auth/AuthenticatorHandler.java
View File

@ -1,5 +1,6 @@
package org.openmetadata.service.security.auth; package org.openmetadata.service.security.auth;
import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty;
import static org.openmetadata.service.exception.CatalogExceptionMessage.NOT_IMPLEMENTED_METHOD; import static org.openmetadata.service.exception.CatalogExceptionMessage.NOT_IMPLEMENTED_METHOD;
import static org.openmetadata.service.util.UserUtil.getRoleListFromUser; import static org.openmetadata.service.util.UserUtil.getRoleListFromUser;
@ -106,7 +107,7 @@ public interface AuthenticatorHandler {
.generateJWTToken( .generateJWTToken(
storedUser.getName(), storedUser.getName(),
getRoleListFromUser(storedUser), getRoleListFromUser(storedUser),
storedUser.getIsAdmin(), !nullOrEmpty(storedUser.getIsAdmin()) && storedUser.getIsAdmin(),
storedUser.getEmail(), storedUser.getEmail(),
expireInSeconds, expireInSeconds,
false, false,

3
openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java
View File

@ -16,6 +16,7 @@ package org.openmetadata.service.security.auth;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST; import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.NOT_IMPLEMENTED; import static javax.ws.rs.core.Response.Status.NOT_IMPLEMENTED;
import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty;
import static org.openmetadata.schema.api.teams.CreateUser.CreatePasswordType.ADMIN_CREATE; import static org.openmetadata.schema.api.teams.CreateUser.CreatePasswordType.ADMIN_CREATE;
import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.SELF; import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.SELF;
import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.USER; import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.USER;
@ -389,7 +390,7 @@ public class BasicAuthenticator implements AuthenticatorHandler {
.generateJWTToken( .generateJWTToken(
storedUser.getName(), storedUser.getName(),
getRoleListFromUser(storedUser), getRoleListFromUser(storedUser),
storedUser.getIsAdmin(), !nullOrEmpty(storedUser.getIsAdmin()) && storedUser.getIsAdmin(),
storedUser.getEmail(), storedUser.getEmail(),
loginConfiguration.getJwtTokenExpiryTime(), loginConfiguration.getJwtTokenExpiryTime(),
false, false,

3
openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlAssertionConsumerServlet.java
View File

@ -13,6 +13,7 @@
package org.openmetadata.service.security.saml; package org.openmetadata.service.security.saml;
import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty;
import static org.openmetadata.service.util.UserUtil.getRoleListFromUser; import static org.openmetadata.service.util.UserUtil.getRoleListFromUser;
import com.onelogin.saml2.Auth; import com.onelogin.saml2.Auth;
@ -90,7 +91,7 @@ public class SamlAssertionConsumerServlet extends HttpServlet {
.generateJWTToken( .generateJWTToken(
username, username,
getRoleListFromUser(user), getRoleListFromUser(user),
user.getIsAdmin(), !nullOrEmpty(user.getIsAdmin()) && user.getIsAdmin(),
email, email,
SamlSettingsHolder.getInstance().getTokenValidity(), SamlSettingsHolder.getInstance().getTokenValidity(),
false, false,

17
openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java
View File

@ -1146,29 +1146,30 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
String user = String user =
"userImportExport,d,s,userImportExport@domain.com,America/Los_Angeles,true,teamImportExport,"; "userImportExport,d,s,userImportExport@domain.com,America/Los_Angeles,true,teamImportExport,";
String user1 = String user1 =
"userImportExport1,,,userImportExport1@domain.com,,,teamImportExport1,DataConsumer"; "userImportExport1,,,userImportExport1@domain.com,,false,teamImportExport1,DataConsumer";
String user11 = "userImportExport11,,,userImportExport11@domain.com,,,teamImportExport11,"; String user11 = "userImportExport11,,,userImportExport11@domain.com,,false,teamImportExport11,";
List<String> createRecords = listOf(user, user1, user11); List<String> createRecords = listOf(user, user1, user11);
// Update user descriptions // Update user descriptions
user = "userImportExport,displayName,,userImportExport@domain.com,,,teamImportExport,"; user = "userImportExport,displayName,,userImportExport@domain.com,,false,teamImportExport,";
user1 = "userImportExport1,displayName1,,userImportExport1@domain.com,,,teamImportExport1,"; user1 =
"userImportExport1,displayName1,,userImportExport1@domain.com,,false,teamImportExport1,";
user11 = user11 =
"userImportExport11,displayName11,,userImportExport11@domain.com,,,teamImportExport11,"; "userImportExport11,displayName11,,userImportExport11@domain.com,,false,teamImportExport11,";
List<String> updateRecords = listOf(user, user1, user11); List<String> updateRecords = listOf(user, user1, user11);
// Add new users // Add new users
String user2 = String user2 =
"userImportExport2,displayName2,,userImportExport2@domain.com,,,teamImportExport1,"; "userImportExport2,displayName2,,userImportExport2@domain.com,,false,teamImportExport1,";
String user21 = String user21 =
"userImportExport21,displayName21,,userImportExport21@domain.com,,,teamImportExport11,"; "userImportExport21,displayName21,,userImportExport21@domain.com,,false,teamImportExport11,";
List<String> newRecords = listOf(user2, user21); List<String> newRecords = listOf(user2, user21);
testImportExport("teamImportExport", UserCsv.HEADERS, createRecords, updateRecords, newRecords); testImportExport("teamImportExport", UserCsv.HEADERS, createRecords, updateRecords, newRecords);
// Import to team11 a user in team1 - since team1 is not under team11 hierarchy, import should // Import to team11 a user in team1 - since team1 is not under team11 hierarchy, import should
// fail // fail
String user3 = String user3 =
"userImportExport3,displayName3,,userImportExport3@domain.com,,,teamImportExport1,"; "userImportExport3,displayName3,,userImportExport3@domain.com,,false,teamImportExport1,";
csv = EntityCsvTest.createCsv(UserCsv.HEADERS, listOf(user3), null); csv = EntityCsvTest.createCsv(UserCsv.HEADERS, listOf(user3), null);
result = importCsv("teamImportExport11", csv, false); result = importCsv("teamImportExport11", csv, false);
String error = String error =

3
openmetadata-spec/src/main/resources/json/schema/entity/teams/user.json
View File

@ -85,7 +85,8 @@
}, },
"isAdmin": { "isAdmin": {
"description": "When true indicates user is an administrator for the system with superuser privileges.", "description": "When true indicates user is an administrator for the system with superuser privileges.",
"type": "boolean" "type": "boolean",
"default": false
}, },
"authenticationMechanism": { "authenticationMechanism": {
"$ref": "#/definitions/authenticationMechanism" "$ref": "#/definitions/authenticationMechanism"