* "hostserv" {
* "nick" "HostServ";
* "modes" "+iok";
- "toplevel_access" "600";
+ * "toplevel_access" "600";
+ * "fallback_other_assignment" "1"; //fall back to another assignment when active assignment gets removed
+ * "manager_can_rename_toplevel" "0"; //managers of a toplevel group may rename the whole group
+ * "manager_can_del_toplevel" "0"; //managers of a toplevel group may delete the whole group
+ * "manager_can_rename_secondlevel" "0"; //managers of a secondlevel group may rename the whole group
+ * "manager_can_del_secondlevel" "0"; //managers of a secondlevel group may delete the whole group
* };
* };
*
#define KEY_ASSIGNMENTS "Assignments"
#define KEY_ACTIVE "active"
+#define HS_FAKEHOST_SPECIAL_CHARS "_-:;" /* alphanum already included */
+
+#define HS_ASSIGNMENTSTATE_AUTO -1
+#define HS_ASSIGNMENTSTATE_OFF 0
+#define HS_ASSIGNMENTSTATE_ON 1
+
+#define HS_FHPARSE_SUCCESS 0
+#define HS_FHPARSE_INVALID 1
+#define HS_FHPARSE_UNKNOWN 2
+
static const struct message_entry msgtab[] = {
{ "HSMSG_ACCESS_DENIED", "Access denied." },
{ "HSMSG_ASSIGNED_FAKEHOSTS", "Assigned Fakehosts for User $b%s$b:" },
{ "HSMSG_FAKEHOST_SECONDLEVEL_ADDED", "Group $b%s.%s$b successfully added." },
{ "HSMSG_FAKEHOST_SECONDLEVEL_ALREADY_EXISTS", "Group $b%s.%s$b already exists." },
{ "HSMSG_FAKEHOST_SECONDLEVEL_DELETED", "Group $b%s.%s$b successfully deleted." },
+ { "HSMSG_FAKEHOST_RENAMED", "Group $b%s.%s$b renamed to $b%s.%s$b." },
{ "HSMSG_MANAGER_ALREADY", "$b%s$b is already a manager of %s.%s" },
{ "HSMSG_MANAGER_ADDED", "$b%s$b is now a manager of %s.%s" },
{ "HSMSG_MANAGER_NOT", "$b%s$b is not a manager of %s.%s" },
int fallback_other_assignment : 1;
int manager_can_del_toplevel : 1;
int manager_can_del_secondlevel : 1;
+ int manager_can_rename_toplevel : 1;
+ int manager_can_rename_secondlevel : 1;
} hostserv_conf;
const char *hostserv_module_deps[] = { NULL };
struct hs_user *next;
};
+/* temporary structs */
+struct hs_fakehost_info {
+ int parse_state;
+ char *tlfh_name;
+ char *slfh_name;
+ struct hs_toplevel *tlfh;
+ struct hs_secondlevel *slfh;
+};
+
/* MANAGEMENT FUNCTIONS for FAKEHOST STRUCTS */
static void hs_del_secondlevel(struct hs_secondlevel *slfh, int remove_from_tlfh);
static void hs_del_manager(struct hs_manager *manager, int remove_from_object);
static void hs_del_assignment(struct hs_assignment *assignment, int remove_from_slfh);
static void hs_del_user(struct hs_user *user);
+static void hs_activate_assignment(struct hs_user *user, struct hs_assignment *assignment);
static void hs_free_all() {
struct hs_toplevel *tlfh, *next_tlfh;
}
for(slfh = tlfh->secondlevel; slfh; slfh = next_slfh) {
next_slfh = slfh->next;
- for(manager = tlfh->managers; manager; manager = next_manager) {
+ for(manager = slfh->managers; manager; manager = next_manager) {
next_manager = manager->next;
free(manager);
}
free(tlfh);
}
+static void hs_rename_toplevel(struct hs_toplevel *tlfh, const char *name) {
+ struct hs_secondlevel *slfh;
+ struct hs_assignment *assng;
+
+ free(tlfh->fakehost);
+ tlfh->fakehost = strdup(name);
+
+ //trigger rename for all assignments
+ for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
+ for(assng = slfh->assignments; assng; assng = assng->next) {
+ if(assng->active) {
+ hs_activate_assignment(assng->user, assng);
+ }
+ }
+ }
+}
+
static struct hs_secondlevel *hs_add_secondlevel(struct hs_toplevel *tlfh, const char *name) {
struct hs_secondlevel *slfh = calloc(1, sizeof(*slfh));
slfh->toplevel = tlfh;
free(slfh);
}
+static void hs_rename_secondlevel(struct hs_secondlevel *slfh, const char *name) {
+ struct hs_assignment *assng;
+
+ free(slfh->fakehost);
+ slfh->fakehost = strdup(name);
+
+ //trigger rename for all assignments
+ for(assng = slfh->assignments; assng; assng = assng->next) {
+ if(assng->active) {
+ hs_activate_assignment(assng->user, assng);
+ }
+ }
+}
+
static struct hs_manager *hs_add_manager_toplevel(struct hs_toplevel *tlfh, struct hs_user *user) {
struct hs_manager *manager = calloc(1, sizeof(*manager));
manager->user = user;
assert((!assignment || (assignment->user == user)));
if(user->assignments) {
- for(assgn = assignment->user->assignments; assgn; assgn = assgn->unext)
+ for(assgn = user->assignments; assgn; assgn = assgn->unext)
assgn->active = 0;
}
assignment->active = 1;
}
- apply_fakehost(assignment->user->hi, NULL);
+ apply_fakehost(user->hi, NULL);
}
-static struct hs_assignment *hs_add_assignment(struct hs_secondlevel *slfh, struct hs_user *user) {
+static struct hs_assignment *hs_add_assignment(struct hs_secondlevel *slfh, struct hs_user *user, int active) {
struct hs_assignment *assignment = calloc(1, sizeof(*assignment));
assignment->secondlevel = slfh;
assignment->user = user;
- if(user->assignments == NULL)
- assignment->active = 1;
+ if(active == HS_ASSIGNMENTSTATE_AUTO)
+ assignment->active = (user->assignments == NULL ? 1 : 0);
+ else
+ assignment->active = (active == HS_ASSIGNMENTSTATE_ON ? 1 : 0);
assignment->next = slfh->assignments;
slfh->assignments = assignment;
assignment->unext = user->assignments;
return 0;
}
+struct hs_fakehost_info parse_fakehost_info(char *fakehost, int fix_name_case) {
+ struct hs_fakehost_info fhinfo;
+ int i;
+ for(i = strlen(fakehost)-1; i >= 0; i--) {
+ if(!isalnum(fakehost[i]) && !strchr(HS_FAKEHOST_SPECIAL_CHARS, fakehost[i])) {
+ fhinfo.parse_state = HS_FHPARSE_INVALID;
+ return fhinfo;
+ }
+ }
+ fhinfo.slfh_name = fakehost;
+ fhinfo.tlfh_name = strchr(fakehost, '.');
+ if(!fhinfo.tlfh_name) {
+ fhinfo.parse_state = HS_FHPARSE_INVALID;
+ return fhinfo;
+ }
+ fhinfo.tlfh_name[0] = '\0';
+ fhinfo.tlfh_name++;
+ if(strchr(fhinfo.tlfh_name, '.')) {
+ fhinfo.parse_state = HS_FHPARSE_INVALID;
+ fhinfo.tlfh_name--;
+ fhinfo.tlfh_name[0] = '\0';
+ return fhinfo;
+ }
+ if(!irccasecmp(fhinfo.slfh_name, "*"))
+ fhinfo.slfh_name = NULL;
+ struct hs_toplevel *tlfh;
+ struct hs_secondlevel *slfh;
+ for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
+ if(!irccasecmp(tlfh->fakehost, fhinfo.tlfh_name)) break;
+ }
+ fhinfo.tlfh = tlfh;
+ if(!tlfh) {
+ fhinfo.slfh = NULL;
+ fhinfo.parse_state = HS_FHPARSE_UNKNOWN;
+ return fhinfo;
+ }
+ if(fhinfo.slfh_name) {
+ for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
+ if(!irccasecmp(slfh->fakehost, fhinfo.slfh_name)) break;
+ }
+ fhinfo.slfh = slfh;
+ if(!slfh) {
+ fhinfo.parse_state = HS_FHPARSE_UNKNOWN;
+ return fhinfo;
+ }
+ } else
+ fhinfo.slfh = NULL;
+ if(fix_name_case) {
+ //simply copy the stored fakehosts over the given ones
+ strcpy(fhinfo.tlfh_name, fhinfo.tlfh->fakehost);
+ strcpy(fhinfo.slfh_name, fhinfo.slfh->fakehost);
+ }
+ fhinfo.parse_state = HS_FHPARSE_SUCCESS;
+ return fhinfo;
+}
+
+
static void cmd_view_toplevel_information(UNUSED_ARG(struct userNode *user), UNUSED_ARG(struct svccmd *cmd), struct hs_toplevel *tlfh) {
reply("HSMSG_TOPLEVEL_FAKEHOSTS", tlfh->fakehost);
reply("NSMSG_MUST_AUTH");
return 0;
}
- char *slfh_name = argv[1];
- char *tlfh_name = strchr(argv[1], '.');
- *tlfh_name = '\0';
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(argv[1], 0);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", argv[1]);
return 0;
- }
- struct hs_toplevel *tlfh;
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
- }
- if(!tlfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- if(!irccasecmp(slfh_name, "*")) {
- if(!check_management_access(hi, tlfh, NULL)) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ if(!fhinfo.slfh) {
+ if(!check_management_access(hi, fhinfo.tlfh, NULL)) {
+ reply("HSMSG_ACCESS_DENIED");
return 0;
}
- cmd_view_toplevel_information(user, cmd, tlfh);
+ cmd_view_toplevel_information(user, cmd, fhinfo.tlfh);
return 1;
} else {
- struct hs_secondlevel *slfh;
- for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
- if(!irccasecmp(slfh->fakehost, slfh_name)) break;
- }
- if(!slfh || !check_management_access(hi, tlfh, slfh)) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ if(!check_management_access(hi, fhinfo.tlfh, fhinfo.slfh)) {
+ reply("HSMSG_ACCESS_DENIED");
return 0;
}
- cmd_view_secondlevel_information(user, cmd, slfh);
+ cmd_view_secondlevel_information(user, cmd, fhinfo.slfh);
return 1;
}
} else {
static MODCMD_FUNC(cmd_addhost) {
struct handle_info *hi;
- struct hs_toplevel *tlfh;
- struct hs_secondlevel *slfh;
if (!(hi = user->handle_info)) {
reply("NSMSG_MUST_AUTH");
return 0;
}
- char *slfh_name = argv[1];
- char *tlfh_name = strchr(argv[1], '.');
- if(!tlfh_name) {
- reply("HSMSG_TOPLEVEL_INVALID", slfh_name);
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(argv[1], 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", argv[1]);
return 0;
}
- *tlfh_name = '\0';
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
- return 0;
- }
- if(!irccasecmp(slfh_name, "*")) {
+ if(!fhinfo.slfh_name) {
if(!check_management_access(hi, NULL, NULL)) {
reply("HSMSG_ACCESS_DENIED");
return 0;
}
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
- }
- if(tlfh) {
- reply("HSMSG_FAKEHOST_TOPLEVEL_ALREADY_EXISTS", slfh_name, tlfh_name);
+ if(fhinfo.parse_state != HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_FAKEHOST_TOPLEVEL_ALREADY_EXISTS", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- hs_add_toplevel(tlfh_name);
- reply("HSMSG_FAKEHOST_TOPLEVEL_ADDED", tlfh_name);
+ hs_add_toplevel(fhinfo.tlfh_name);
+ reply("HSMSG_FAKEHOST_TOPLEVEL_ADDED", fhinfo.tlfh_name);
} else {
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
- }
- if(!tlfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ if(!fhinfo.tlfh) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- if(!check_management_access(hi, tlfh, NULL)) {
+ if(!check_management_access(hi, fhinfo.tlfh, NULL)) {
reply("HSMSG_ACCESS_DENIED");
return 0;
}
- for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
- if(!irccasecmp(slfh->fakehost, slfh_name)) break;
- }
- if(slfh) {
- reply("HSMSG_FAKEHOST_SECONDLEVEL_ALREADY_EXISTS", slfh_name, tlfh_name);
+ if(fhinfo.parse_state != HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_FAKEHOST_SECONDLEVEL_ALREADY_EXISTS", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- hs_add_secondlevel(tlfh, slfh_name);
- reply("HSMSG_FAKEHOST_SECONDLEVEL_ADDED", slfh_name, tlfh_name);
+ hs_add_secondlevel(fhinfo.tlfh, fhinfo.slfh_name);
+ reply("HSMSG_FAKEHOST_SECONDLEVEL_ADDED", fhinfo.slfh_name, fhinfo.tlfh_name);
}
return 1;
}
reply("NSMSG_MUST_AUTH");
return 0;
}
- char *slfh_name = argv[1];
- char *tlfh_name = strchr(argv[1], '.');
- *tlfh_name = '\0';
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(argv[1], 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", argv[1]);
return 0;
- }
- struct hs_toplevel *tlfh;
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
- }
- if(!tlfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- if(!irccasecmp(slfh_name, "*")) {
- if(!check_management_access(hi, (hostserv_conf.manager_can_del_toplevel ? tlfh : NULL), NULL)) { /* manager access is enough to delete whole toplevel? */
+ if(!fhinfo.slfh) {
+ if(!check_management_access(hi, (hostserv_conf.manager_can_del_toplevel ? fhinfo.tlfh : NULL), NULL)) { /* manager access is enough to delete whole toplevel? */
reply("HSMSG_ACCESS_DENIED");
return 0;
}
- hs_del_toplevel(tlfh);
- reply("HSMSG_FAKEHOST_TOPLEVEL_DELETED", tlfh_name);
+ hs_del_toplevel(fhinfo.tlfh);
+ reply("HSMSG_FAKEHOST_TOPLEVEL_DELETED", fhinfo.tlfh_name);
} else {
- struct hs_secondlevel *slfh;
- for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
- if(!irccasecmp(slfh->fakehost, slfh_name)) break;
+ if(!check_management_access(hi, fhinfo.tlfh, (hostserv_conf.manager_can_del_secondlevel ? fhinfo.slfh : NULL))) {
+ reply("HSMSG_ACCESS_DENIED");
+ return 0;
}
- if(!slfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ hs_del_secondlevel(fhinfo.slfh, 1);
+ reply("HSMSG_FAKEHOST_SECONDLEVEL_DELETED", fhinfo.slfh_name, fhinfo.tlfh_name);
+ }
+ return 1;
+}
+
+static MODCMD_FUNC(cmd_renamehost) {
+ struct handle_info *hi;
+ if (!(hi = user->handle_info)) {
+ reply("NSMSG_MUST_AUTH");
+ return 0;
+ }
+ //old fakehost name
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(argv[1], 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", argv[1]);
+ return 0;
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 0;
+ }
+ //new fakehost name
+ struct hs_fakehost_info new_fhinfo = parse_fakehost_info(argv[2], 0);
+ if(new_fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", argv[1]);
+ return 0;
+ } else if(new_fhinfo.parse_state != HS_FHPARSE_UNKNOWN && (irccasecmp(fhinfo.tlfh_name, new_fhinfo.tlfh_name) || (new_fhinfo.slfh && new_fhinfo.slfh_name && irccasecmp(fhinfo.slfh_name, new_fhinfo.slfh_name)))) {
+ reply("HSMSG_FAKEHOST_TOPLEVEL_ALREADY_EXISTS", new_fhinfo.slfh_name, new_fhinfo.tlfh_name);
+ return 0;
+ }
+
+ if(!fhinfo.slfh) {
+ if(!check_management_access(hi, (hostserv_conf.manager_can_rename_toplevel ? fhinfo.tlfh : NULL), NULL)) { /* manager access is enough to delete whole toplevel? */
+ reply("HSMSG_ACCESS_DENIED");
+ return 0;
+ }
+ if(new_fhinfo.slfh_name) {
+ //can't rename toplevel into secondlevel fakehost!
+ new_fhinfo.tlfh_name--;
+ new_fhinfo.tlfh_name[0] = '.';
+ reply("HSMSG_TOPLEVEL_INVALID", new_fhinfo.slfh_name);
return 0;
}
- if(!check_management_access(hi, tlfh, (hostserv_conf.manager_can_del_secondlevel ? slfh : NULL))) {
+ if(strcmp(new_fhinfo.tlfh_name, fhinfo.tlfh->fakehost))
+ hs_rename_toplevel(fhinfo.tlfh, new_fhinfo.tlfh_name);
+ reply("HSMSG_FAKEHOST_RENAMED", fhinfo.slfh_name, fhinfo.tlfh_name, new_fhinfo.slfh_name, new_fhinfo.tlfh_name);
+ } else {
+ if(!check_management_access(hi, fhinfo.tlfh, (hostserv_conf.manager_can_rename_secondlevel ? fhinfo.slfh : NULL))) {
reply("HSMSG_ACCESS_DENIED");
return 0;
}
- hs_del_secondlevel(slfh, 1);
- reply("HSMSG_FAKEHOST_SECONDLEVEL_DELETED", slfh_name, tlfh_name);
+ if(irccasecmp(new_fhinfo.tlfh_name, fhinfo.tlfh_name)) {
+ //can't rename toplevel and secondlevel fakehost with one command!
+ new_fhinfo.tlfh_name--;
+ new_fhinfo.tlfh_name[0] = '.';
+ reply("HSMSG_TOPLEVEL_INVALID", new_fhinfo.slfh_name);
+ return 0;
+ }
+ if(strcmp(new_fhinfo.slfh_name, fhinfo.slfh->fakehost))
+ hs_rename_secondlevel(fhinfo.slfh, new_fhinfo.slfh_name);
+ reply("HSMSG_FAKEHOST_RENAMED", fhinfo.slfh_name, fhinfo.tlfh_name, new_fhinfo.slfh_name, new_fhinfo.tlfh_name);
}
return 1;
}
static MODCMD_FUNC(cmd_addmanager) {
struct handle_info *hi;
char *fakehost;
- if(argc >= 3) {
- if(!strchr(argv[1], '.')) {
- if (!(hi = modcmd_get_handle_info(user, argv[1])))
- return 0;
- fakehost = argv[2];
- } else {
- if (!(hi = modcmd_get_handle_info(user, argv[2])))
- return 0;
- fakehost = argv[1];
- }
- char *slfh_name = fakehost;
- char *tlfh_name = strchr(fakehost, '.');
- *tlfh_name = '\0';
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ if(!strchr(argv[1], '.')) {
+ if (!(hi = modcmd_get_handle_info(user, argv[1])))
return 0;
- }
- struct hs_toplevel *tlfh;
- struct hs_secondlevel *slfh = NULL;
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
- }
- if(!tlfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ fakehost = argv[2];
+ } else {
+ if (!(hi = modcmd_get_handle_info(user, argv[2])))
return 0;
- }
- if(!irccasecmp(slfh_name, "*")) {
- if(!check_management_access(user->handle_info, tlfh, NULL)) {
- reply("HSMSG_ACCESS_DENIED");
- return 0;
- }
- } else {
- for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
- if(!irccasecmp(slfh->fakehost, slfh_name)) break;
- }
- if(!slfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
- return 0;
- }
- if(!check_management_access(user->handle_info, tlfh, slfh)) {
- reply("HSMSG_ACCESS_DENIED");
- return 0;
- }
- }
- struct hs_user *huser = hs_get_user(hi, 1);
- struct hs_manager *manager;
- if(slfh) {
- for(manager = huser->managements; manager; manager = manager->next) {
- if(manager->type == 2 && manager->object == slfh) {
- reply("HSMSG_MANAGER_ALREADY", hi->handle, slfh_name, tlfh_name);
- return 0;
- }
- }
- }
+ fakehost = argv[1];
+ }
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(fakehost, 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", fakehost);
+ return 0;
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 0;
+ }
+ if(!check_management_access(user->handle_info, fhinfo.tlfh, fhinfo.slfh)) {
+ reply("HSMSG_ACCESS_DENIED");
+ return 0;
+ }
+ struct hs_user *huser = hs_get_user(hi, 1);
+ struct hs_manager *manager;
+ if(fhinfo.slfh) {
for(manager = huser->managements; manager; manager = manager->next) {
- if(manager->type == 1 && manager->object == tlfh) {
- reply("HSMSG_MANAGER_ALREADY", hi->handle, "*", tlfh_name);
+ if(manager->type == 2 && manager->object == fhinfo.slfh) {
+ reply("HSMSG_MANAGER_ALREADY", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
}
- if(slfh)
- hs_add_manager_secondlevel(slfh, huser);
- else
- hs_add_manager_toplevel(tlfh, huser);
- reply("HSMSG_MANAGER_ADDED", hi->handle, slfh_name, tlfh_name);
- return 1;
}
- return 0;
+ for(manager = huser->managements; manager; manager = manager->next) {
+ if(manager->type == 1 && manager->object == fhinfo.tlfh) {
+ reply("HSMSG_MANAGER_ALREADY", hi->handle, "*", fhinfo.tlfh_name);
+ return 0;
+ }
+ }
+ if(fhinfo.slfh)
+ hs_add_manager_secondlevel(fhinfo.slfh, huser);
+ else
+ hs_add_manager_toplevel(fhinfo.tlfh, huser);
+ reply("HSMSG_MANAGER_ADDED", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 1;
}
static MODCMD_FUNC(cmd_delmanager) {
return 0;
fakehost = argv[1];
}
- char *slfh_name = fakehost;
- char *tlfh_name = strchr(fakehost, '.');
- if(tlfh_name) {
- *tlfh_name = '\0';
- } else {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, "");
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(fakehost, 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", fakehost);
return 0;
- }
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- struct hs_toplevel *tlfh;
- struct hs_secondlevel *slfh = NULL;
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
- }
- if(!tlfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ if(!check_management_access(user->handle_info, fhinfo.tlfh, fhinfo.slfh)) {
+ reply("HSMSG_ACCESS_DENIED");
return 0;
}
- if(!irccasecmp(slfh_name, "*")) {
- if(!check_management_access(user->handle_info, tlfh, NULL)) {
- reply("HSMSG_ACCESS_DENIED");
- return 0;
- }
- } else {
- for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
- if(!irccasecmp(slfh->fakehost, slfh_name)) break;
- }
- if(!slfh) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
- return 0;
- }
- if(!check_management_access(user->handle_info, tlfh, slfh)) {
- reply("HSMSG_ACCESS_DENIED");
- return 0;
- }
- }
struct hs_user *huser = hs_get_user(hi, 0);
struct hs_manager *manager;
if(!huser) {
- reply("HSMSG_MANAGER_NOT", hi->handle, slfh_name, tlfh_name);
+ reply("HSMSG_MANAGER_NOT", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- if(slfh) {
+ if(fhinfo.slfh) {
for(manager = huser->managements; manager; manager = manager->next) {
- if(manager->type == 2 && manager->object == slfh)
+ if(manager->type == 2 && manager->object == fhinfo.slfh)
break;
}
if(!manager) {
- reply("HSMSG_MANAGER_NOT", hi->handle, slfh_name, tlfh_name);
+ reply("HSMSG_MANAGER_NOT", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
} else {
for(manager = huser->managements; manager; manager = manager->next) {
- if(manager->type == 1 && manager->object == tlfh)
+ if(manager->type == 1 && manager->object == fhinfo.tlfh)
break;
}
if(!manager) {
- reply("HSMSG_MANAGER_NOT", hi->handle, "*", tlfh_name);
+ reply("HSMSG_MANAGER_NOT", hi->handle, "*", fhinfo.tlfh_name);
return 0;
}
}
hs_del_manager(manager, 1);
- reply("HSMSG_MANAGER_DELETED", hi->handle, slfh_name, tlfh_name);
+ reply("HSMSG_MANAGER_DELETED", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
return 1;
}
struct hs_assignment *assignment;
struct hs_toplevel *tlfh;
struct hs_secondlevel *slfh;
- char *fakehost;
if (!(hi = user->handle_info)) {
reply("NSMSG_MUST_AUTH");
hs_activate_assignment(hs_user, NULL);
return 1;
} else {
- if(!strchr(argv[1], '.')) {
-
- }
- fakehost = argv[1];
- char *slfh_name = fakehost;
- char *tlfh_name = strchr(fakehost, '.');
- if(tlfh_name) {
- *tlfh_name = '\0';
- tlfh_name++;
- }
- if(!tlfh_name || strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, (tlfh_name ? tlfh_name : ""));
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(argv[1], 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", argv[1]);
+ return 0;
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
for(assignment = hs_user->assignments; assignment; assignment = assignment->unext) {
slfh = assignment->secondlevel;
tlfh = slfh->toplevel;
- if(!irccasecmp(tlfh_name, tlfh->fakehost) && !irccasecmp(slfh_name, slfh->fakehost)) {
+ if(tlfh == fhinfo.tlfh && slfh == fhinfo.slfh) {
hs_activate_assignment(hs_user, assignment);
reply("HSMSG_FAKEHOST_SET_SUCCESS", slfh->fakehost, tlfh->fakehost);
return 1;
}
}
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
}
reply("NSMSG_MUST_AUTH");
return 0;
}
- char *slfh_name = fakehost;
- char *tlfh_name = strchr(fakehost, '.');
- if(tlfh_name) {
- *tlfh_name = '\0';
- } else {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, "");
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(fakehost, 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", fakehost);
return 0;
- }
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN || !fhinfo.slfh) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- struct hs_toplevel *tlfh;
- struct hs_secondlevel *slfh;
struct hs_user *hs_user = hs_get_user(hi, 1);
- for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
- if(!irccasecmp(tlfh_name, tlfh->fakehost)) {
- for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
- if(!irccasecmp(slfh_name, slfh->fakehost)) {
- if(!check_management_access(user->handle_info, tlfh, slfh)) {
- reply("HSMSG_ACCESS_DENIED");
- return 0;
- }
- if(hs_get_assignment(slfh, hs_user)) {
- reply("HSMSG_FAKEHOST_ASSIGNED", slfh_name, tlfh_name);
- return 0;
- }
- hs_add_assignment(slfh, hs_user);
- reply("HSMSG_FAKEHOST_ASSIGN_SUCCESS", slfh_name, tlfh_name);
- return 1;
- }
- }
- }
+ if(!check_management_access(user->handle_info, fhinfo.tlfh, fhinfo.slfh)) {
+ reply("HSMSG_ACCESS_DENIED");
+ return 0;
}
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
- return 0;
+ if(hs_get_assignment(fhinfo.slfh, hs_user)) {
+ reply("HSMSG_FAKEHOST_ASSIGNED", fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 0;
+ }
+ hs_add_assignment(fhinfo.slfh, hs_user, HS_ASSIGNMENTSTATE_AUTO);
+ reply("HSMSG_FAKEHOST_ASSIGN_SUCCESS", fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 1;
}
static MODCMD_FUNC(cmd_unassign) {
reply("NSMSG_MUST_AUTH");
return 0;
}
- char *slfh_name = fakehost;
- char *tlfh_name = strchr(fakehost, '.');
- if(tlfh_name) {
- *tlfh_name = '\0';
- } else {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, "");
+ struct hs_fakehost_info fhinfo = parse_fakehost_info(fakehost, 1);
+ if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
+ reply("HSMSG_TOPLEVEL_INVALID", fakehost);
return 0;
- }
- tlfh_name++;
- if(strchr(tlfh_name, '.')) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ } else if(fhinfo.parse_state == HS_FHPARSE_UNKNOWN || !fhinfo.slfh) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
struct hs_assignment *assignment;
struct hs_user *hs_user = hs_get_user(hi, 0);
if(!hs_user) {
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
return 0;
}
- for(assignment = hs_user->assignments; assignment; assignment = assignment->unext) {
- if(!irccasecmp(slfh_name, assignment->secondlevel->fakehost)) {
- if(!irccasecmp(tlfh_name, assignment->secondlevel->toplevel->fakehost)) {
- if(!check_management_access(user->handle_info, assignment->secondlevel->toplevel, assignment->secondlevel)) {
- reply("HSMSG_ACCESS_DENIED");
- return 0;
- }
- hs_del_assignment(assignment, 1);
- reply("HSMSG_FAKEHOST_UNASSIGN_SUCCESS", slfh_name, tlfh_name);
- return 1;
- }
- }
+ if(!check_management_access(user->handle_info, fhinfo.tlfh, fhinfo.slfh)) {
+ reply("HSMSG_ACCESS_DENIED");
+ return 0;
}
- reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
- return 0;
+ if(!(assignment = hs_get_assignment(fhinfo.slfh, hs_user))) {
+ reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 0;
+ }
+ hs_del_assignment(assignment, 1);
+ reply("HSMSG_FAKEHOST_UNASSIGN_SUCCESS", fhinfo.slfh_name, fhinfo.tlfh_name);
+ return 1;
}
static void hostserv_conf_read(void) {
str = database_get_data(conf_node, "manager_can_del_secondlevel", RECDB_QSTRING);
hostserv_conf.manager_can_del_secondlevel = (atoi(str) ? 1 : 0);
+ str = database_get_data(conf_node, "manager_can_rename_toplevel", RECDB_QSTRING);
+ hostserv_conf.manager_can_rename_toplevel = (atoi(str) ? 1 : 0);
+
+ str = database_get_data(conf_node, "manager_can_rename_secondlevel", RECDB_QSTRING);
+ hostserv_conf.manager_can_rename_secondlevel = (atoi(str) ? 1 : 0);
+
/*str = database_get_data(conf_node, "description", RECDB_QSTRING);
hostserv_conf.description = (str ? str : NULL);*/
}
struct record_data *rd = data;
struct hs_secondlevel *slfh = extra;
struct hs_user *user;
- struct hs_assignment *assng;
+ int active;
if (rd->type == RECDB_OBJECT) {
dict_t db = GET_RECORD_OBJECT(rd);
user = hs_get_user(get_handle_info(name), 1);
- assng = hs_add_assignment(slfh, user);
+ active = (database_get_data(db, KEY_ACTIVE, RECDB_QSTRING) ? HS_ASSIGNMENTSTATE_ON : HS_ASSIGNMENTSTATE_OFF);
- if (database_get_data(db, KEY_ACTIVE, RECDB_QSTRING))
- assng->active = 1;
- else
- assng->active = 0;
+ hs_add_assignment(slfh, user, active);
}
return 0;
modcmd_register(hostserv_module, "unassign", cmd_unassign, 3, MODCMD_REQUIRE_AUTHED, NULL);
modcmd_register(hostserv_module, "addhost", cmd_addhost, 2, MODCMD_REQUIRE_AUTHED, NULL);
modcmd_register(hostserv_module, "delhost", cmd_delhost, 2, MODCMD_REQUIRE_AUTHED, NULL);
+ modcmd_register(hostserv_module, "renamehost", cmd_renamehost, 3, MODCMD_REQUIRE_AUTHED, NULL);
message_register_table(msgtab);
return 1;
}
projects / srvx.git / blobdiff