From a8abff463f81d1f6ee9e10b7bc503ff44b559175 Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Wed, 29 May 2019 20:28:19 +0900 Subject: [PATCH] Revert "Add security usertype" Container feature is removed. Change-Id: Icf85ad34343f4f383c025fb4039d15a9b68f95a9 --- data/tizen/etc/gumd/gumd-tizen-common.conf | 10 ---------- include/gum/common/gum-config-general.h | 24 ------------------------ include/gum/common/gum-user-types.h | 5 ++--- src/common/gum-config.c | 7 ------- src/common/gum-user-types.c | 3 +-- src/daemon/core/gumd-daemon-user.c | 18 ++---------------- 6 files changed, 5 insertions(+), 62 deletions(-) diff --git a/data/tizen/etc/gumd/gumd-tizen-common.conf b/data/tizen/etc/gumd/gumd-tizen-common.conf index 2afbcc4..07dcc3c 100755 --- a/data/tizen/etc/gumd/gumd-tizen-common.conf +++ b/data/tizen/etc/gumd/gumd-tizen-common.conf @@ -58,7 +58,6 @@ GSHADOW_FILE=/etc/gshadow # Path to user shell executable. Default value is '/bin/bash' #SHELL=/bin/bash -SEC_SHELL=/sbin/nologin # Path to skeleton folder. When new users are created, contents of the skel # folder is copied to user home directory. Default value is '/etc/skel' @@ -87,15 +86,6 @@ UID_MIN=5000 # Default value is: 5999 UID_MAX=5999 -# Minimum value for the automatic uid selection for security user. -# Default value is: 6000 -# Actual implementation: use min + 1 value in _get_default_uid_range -SEC_UID_MIN=6000 - -# Maximum value for the automatic uid selection for security user. -# Default value is: 6999 -SEC_UID_MAX=6999 - # Minimum value for the automatic gid selection for system user. # Default value is: 100 # Actual implementation: use min + 1 value in _get_default_gid_range diff --git a/include/gum/common/gum-config-general.h b/include/gum/common/gum-config-general.h index b000f72..7a8f3f2 100644 --- a/include/gum/common/gum-config-general.h +++ b/include/gum/common/gum-config-general.h @@ -146,14 +146,6 @@ "/SHELL" /** - * GUM_CONFIG_GENERAL_SEC_SHELL: - * - * Path to security user shell executable. Default value is '/bin/bash' - */ -#define GUM_CONFIG_GENERAL_SEC_SHELL GUM_CONFIG_GENERAL \ - "/SEC_SHELL" - -/** * GUM_CONFIG_GENERAL_SKEL_DIR: * * Path to skeleton folder. When new users are created, contents of the skel @@ -208,22 +200,6 @@ "/SYS_UID_MAX" /** - * GUM_CONFIG_GENERAL_SEC_UID_MIN: - * - * Minimum value for the automatic uid selection. Default value is: 60001 - */ -#define GUM_CONFIG_GENERAL_SEC_UID_MIN GUM_CONFIG_GENERAL \ - "/SEC_UID_MIN" - -/** - * GUM_CONFIG_GENERAL_SEC_UID_MAX: - * - * Maximum value for the automatic uid selection. Default value is: 60100 - */ -#define GUM_CONFIG_GENERAL_SEC_UID_MAX GUM_CONFIG_GENERAL \ - "/SEC_UID_MAX" - -/** * GUM_CONFIG_GENERAL_GID_MIN: * * Minimum value for the automatic gid selection. Default value is: 2000 diff --git a/include/gum/common/gum-user-types.h b/include/gum/common/gum-user-types.h index d574c35..1b6bde7 100644 --- a/include/gum/common/gum-user-types.h +++ b/include/gum/common/gum-user-types.h @@ -68,7 +68,7 @@ G_BEGIN_DECLS * * Defines total number of types of the users. */ -#define GUM_USERTYPE_COUNT 6 +#define GUM_USERTYPE_COUNT 5 /** * GUM_USERTYPE_MAX_VALUE: @@ -82,8 +82,7 @@ typedef enum { GUM_USERTYPE_SYSTEM = 0x01, GUM_USERTYPE_ADMIN = 0x02, GUM_USERTYPE_GUEST = 0x04, - GUM_USERTYPE_NORMAL = 0x08, - GUM_USERTYPE_SECURITY = 0x10 + GUM_USERTYPE_NORMAL = 0x08 } GumUserType; const gchar * diff --git a/src/common/gum-config.c b/src/common/gum-config.c index ecc5562..66623d2 100755 --- a/src/common/gum-config.c +++ b/src/common/gum-config.c @@ -113,8 +113,6 @@ G_DEFINE_TYPE (GumConfig, gum_config, G_TYPE_OBJECT); #define SYS_UID_MAX 499 #define UID_MIN 5000 #define UID_MAX 5999 -#define SEC_UID_MIN 6000 -#define SEC_UID_MAX 6999 #define SYS_GID_MIN 100 #define SYS_GID_MAX 499 @@ -373,8 +371,6 @@ _load_config ( g_strcmp0 (GUM_CONFIG_GENERAL_UID_MAX, key) == 0 || g_strcmp0 (GUM_CONFIG_GENERAL_SYS_UID_MIN, key) == 0 || g_strcmp0 (GUM_CONFIG_GENERAL_SYS_UID_MAX, key) == 0 || - g_strcmp0 (GUM_CONFIG_GENERAL_SEC_UID_MIN, key) == 0 || - g_strcmp0 (GUM_CONFIG_GENERAL_SEC_UID_MAX, key) == 0 || g_strcmp0 (GUM_CONFIG_GENERAL_GID_MIN, key) == 0 || g_strcmp0 (GUM_CONFIG_GENERAL_GID_MAX, key) == 0 || g_strcmp0 (GUM_CONFIG_GENERAL_SYS_GID_MIN, key) == 0 || @@ -645,15 +641,12 @@ _gum_config_initialize ( } gum_config_set_string (self, GUM_CONFIG_GENERAL_SHELL, GUM_SHELL); - gum_config_set_string (self, GUM_CONFIG_GENERAL_SEC_SHELL, GUM_SHELL); gum_config_set_string (self, GUM_CONFIG_GENERAL_SKEL_DIR, GUM_SKEL_DIR); gum_config_set_uint (self, GUM_CONFIG_GENERAL_UID_MIN, UID_MIN); gum_config_set_uint (self, GUM_CONFIG_GENERAL_UID_MAX, UID_MAX); gum_config_set_uint (self, GUM_CONFIG_GENERAL_SYS_UID_MIN, SYS_UID_MIN); gum_config_set_uint (self, GUM_CONFIG_GENERAL_SYS_UID_MAX, SYS_UID_MAX); - gum_config_set_uint (self, GUM_CONFIG_GENERAL_SEC_UID_MIN, SEC_UID_MIN); - gum_config_set_uint (self, GUM_CONFIG_GENERAL_SEC_UID_MAX, SEC_UID_MAX); gum_config_set_uint (self, GUM_CONFIG_GENERAL_GID_MIN, GID_MIN); gum_config_set_uint (self, GUM_CONFIG_GENERAL_GID_MAX, GID_MAX); diff --git a/src/common/gum-user-types.c b/src/common/gum-user-types.c index bd91679..b60a064 100644 --- a/src/common/gum-user-types.c +++ b/src/common/gum-user-types.c @@ -48,8 +48,7 @@ GumUserTypeString user_type_strings[GUM_USERTYPE_COUNT] = { {GUM_USERTYPE_SYSTEM, "system"}, {GUM_USERTYPE_ADMIN, "admin"}, {GUM_USERTYPE_GUEST, "guest"}, - {GUM_USERTYPE_NORMAL, "normal"}, - {GUM_USERTYPE_SECURITY, "security"} + {GUM_USERTYPE_NORMAL, "normal"} }; gint16 diff --git a/src/daemon/core/gumd-daemon-user.c b/src/daemon/core/gumd-daemon-user.c index efbabd6..0681329 100755 --- a/src/daemon/core/gumd-daemon-user.c +++ b/src/daemon/core/gumd-daemon-user.c @@ -787,9 +787,6 @@ _get_default_uid_range ( if (ut == GUM_USERTYPE_SYSTEM) *min = (uid_t) gum_config_get_uint (config, GUM_CONFIG_GENERAL_SYS_UID_MIN, GUM_USER_INVALID_UID); - else if (ut == GUM_USERTYPE_SECURITY) - *min = (uid_t) gum_config_get_uint (config, - GUM_CONFIG_GENERAL_SEC_UID_MIN, GUM_USER_INVALID_UID); else *min = (uid_t) gum_config_get_uint (config, GUM_CONFIG_GENERAL_UID_MIN, GUM_USER_INVALID_UID); @@ -801,9 +798,6 @@ _get_default_uid_range ( if (ut == GUM_USERTYPE_SYSTEM) *max = (uid_t) gum_config_get_uint (config, GUM_CONFIG_GENERAL_SYS_UID_MAX, GUM_USER_INVALID_UID); - else if (ut == GUM_USERTYPE_SECURITY) - *max = (uid_t) gum_config_get_uint (config, - GUM_CONFIG_GENERAL_SEC_UID_MAX, GUM_USER_INVALID_UID); else *max = (uid_t) gum_config_get_uint (config, GUM_CONFIG_GENERAL_UID_MAX, GUM_USER_INVALID_UID); @@ -1708,7 +1702,6 @@ gumd_daemon_user_add ( uid_t *uid, GError **error) { - GumUserType usertype = GUM_USERTYPE_NONE; DBG (""); /* reset uid if set @@ -1727,21 +1720,14 @@ gumd_daemon_user_add ( *** copy skel files and set permissions * unlock db */ - usertype = _get_usertype_from_gecos (self->priv->pw); - if (usertype == GUM_USERTYPE_NONE) { + if (_get_usertype_from_gecos (self->priv->pw) == GUM_USERTYPE_NONE) { GUM_RETURN_WITH_ERROR (GUM_ERROR_USER_INVALID_USER_TYPE, "Invalid user type", error, FALSE); } if (!self->priv->pw->pw_shell) { - if (usertype == GUM_USERTYPE_SECURITY) { - _set_shell_property (self, gum_config_get_string (self->priv->config, - GUM_CONFIG_GENERAL_SEC_SHELL)); - } - else { - _set_shell_property (self, gum_config_get_string (self->priv->config, + _set_shell_property (self, gum_config_get_string (self->priv->config, GUM_CONFIG_GENERAL_SHELL)); - } } if (!gum_lock_pwdf_lock ()) { -- 2.7.4