From d86ef503b3218a8615acdfe658e90761de30d86b Mon Sep 17 00:00:00 2001 From: klondike Date: Fri, 4 Apr 2014 04:59:13 +0200 Subject: [PATCH] Add opbots and unrestricted bots --- src/core/auth.c | 3 +++ src/core/inf.c | 12 ++++++++++++ src/util/credentials.c | 15 +++++++++++++++ src/util/credentials.h | 5 ++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/core/auth.c b/src/core/auth.c index 3d0686f..3cb9faa 100644 --- a/src/core/auth.c +++ b/src/core/auth.c @@ -170,6 +170,9 @@ static int acl_parse_line(char* line, int line_count, void* ptr_data) LOG_DEBUG("acl_parse_line: '%s'", line); ACL_ADD_USER("bot", handle->users, auth_cred_bot); + ACL_ADD_USER("ubot", handle->users, auth_cred_ubot); + ACL_ADD_USER("opbot", handle->users, auth_cred_opbot); + ACL_ADD_USER("opubot", handle->users, auth_cred_opubot); ACL_ADD_USER("user_admin", handle->users, auth_cred_admin); ACL_ADD_USER("user_super", handle->users, auth_cred_super); ACL_ADD_USER("user_op", handle->users, auth_cred_operator); diff --git a/src/core/inf.c b/src/core/inf.c index 2e8d37a..0fedc98 100644 --- a/src/core/inf.c +++ b/src/core/inf.c @@ -571,6 +571,10 @@ static int set_credentials(struct hub_info* hub, struct hub_user* user, struct a adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_BOT); break; + case auth_cred_ubot: + adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_BOT); + break; + case auth_cred_guest: /* Nothing to be added to the info message */ break; @@ -583,6 +587,14 @@ static int set_credentials(struct hub_info* hub, struct hub_user* user, struct a adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_OPERATOR); break; + case auth_cred_opbot: + adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_HUBBOT); + break; + + case auth_cred_opubot: + adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_HUBBOT); + break; + case auth_cred_super: adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_SUPER_USER); break; diff --git a/src/util/credentials.c b/src/util/credentials.c index bb87407..f4a2820 100644 --- a/src/util/credentials.c +++ b/src/util/credentials.c @@ -24,6 +24,9 @@ int auth_cred_is_protected(enum auth_credentials cred) switch (cred) { case auth_cred_bot: + case auth_cred_ubot: + case auth_cred_opbot: + case auth_cred_opubot: case auth_cred_operator: case auth_cred_super: case auth_cred_admin: @@ -45,6 +48,9 @@ int auth_cred_is_registered(enum auth_credentials cred) switch (cred) { case auth_cred_bot: + case auth_cred_ubot: + case auth_cred_opbot: + case auth_cred_opubot: case auth_cred_user: case auth_cred_operator: case auth_cred_super: @@ -64,6 +70,9 @@ const char* auth_cred_to_string(enum auth_credentials cred) { case auth_cred_none: return "none"; case auth_cred_bot: return "bot"; + case auth_cred_ubot: return "ubot"; + case auth_cred_opbot: return "opbot"; + case auth_cred_opubot: return "opubot"; case auth_cred_guest: return "guest"; case auth_cred_user: return "user"; case auth_cred_operator: return "operator"; @@ -95,14 +104,20 @@ int auth_string_to_cred(const char* str, enum auth_credentials* out) if (!strcasecmp(str, "none")) { *out = auth_cred_none; return 1; } if (!strcasecmp(str, "user")) { *out = auth_cred_user; return 1; } if (!strcasecmp(str, "link")) { *out = auth_cred_link; return 1; } + if (!strcasecmp(str, "ubot")) { *out = auth_cred_ubot; return 1; } return 0; case 5: if (!strcasecmp(str, "admin")) { *out = auth_cred_admin; return 1; } if (!strcasecmp(str, "super")) { *out = auth_cred_super; return 1; } + if (!strcasecmp(str, "opbot")) { *out = auth_cred_opbot; return 1; } if (!strcasecmp(str, "guest")) { *out = auth_cred_guest; return 1; } return 0; + case 6: + if (!strcasecmp(str, "opubot")) { *out = auth_cred_opubot; return 1; } + return 0; + case 8: if (!strcasecmp(str, "operator")) { *out = auth_cred_operator; return 1; } return 0; diff --git a/src/util/credentials.h b/src/util/credentials.h index 7628eb9..7fdbe43 100644 --- a/src/util/credentials.h +++ b/src/util/credentials.h @@ -23,10 +23,13 @@ enum auth_credentials { auth_cred_none, /**<<< "User has no credentials (not yet logged in)" */ - auth_cred_bot, /**<<< "User is a robot" */ auth_cred_guest, /**<<< "User is a guest (unregistered user)" */ auth_cred_user, /**<<< "User is identified as a registered user" */ + auth_cred_bot, /**<<< "User is a robot" */ + auth_cred_ubot, /**<<< "User is an unrestricted robot" */ auth_cred_operator, /**<<< "User is identified as a hub operator" */ + auth_cred_opbot, /**<<< "User is a operator robot" */ + auth_cred_opubot, /**<<< "User is an unrestricted operator robot" */ auth_cred_super, /**<<< "User is a super user" (not used) */ auth_cred_link, /**<<< "User is a link (not used currently)" */ auth_cred_admin, /**<<< "User is identified as a hub administrator/owner" */