NurPech@nextirc.net
[srvx.git] / src / mod-hostserv.c
index 6dd35d020070c448ec15a6329465f3e9f551f279..900a5f1163cd4114ce40ef4ff35fa770897fb755 100644 (file)
@@ -1,5 +1,5 @@
-/* mod-watchdog.c - Watchdog module for srvx
- * Copyright 2003-2004 Martijn Smit and srvx Development Team
+/* mod-hostserv.c - HostServ module for srvx
+ * Copyright 2012-2013 pk910, RenĂ© Gessinger
  *
  * This file is part of srvx.
  *
 #include "timeq.h"
 #include "gline.h"
 
-#define KEY_TOPLEVEL "toplevel"
-#define KEY_SECONDLEVEL "secondlevel"
-#define KEY_MANAGERS "managers"
-#define KEY_FAKEHOST "fakehost"
-#define KEY_ASSIGNMENTS "assignments"
-
-
+#define KEY_TOPLEVEL "TopLevel"
+#define KEY_SECONDLEVEL "SecondLevel"
+#define KEY_MANAGERS "Manager"
+#define KEY_ASSIGNMENTS "Assignments"
+#define KEY_ACTIVE "active"
+#define KEY_TITLEHOST_SUFFIX "title_suffix"
 
 static const struct message_entry msgtab[] = {
     { "HSMSG_ASSIGNED_FAKEHOSTS", "Assigned Fakehosts for User $b%s$b:" },
     { "HSMSG_ASSIGNED_FAKEHOST", "  $b%s.%s$b" },
     { "HSMSG_ASSIGNED_FAKEHOST_ACTTIVE", "  $b%s.%s$b (active)" },
-    { "HSMSG_ASSIGN_HOWTO", "Use $bassign xxx.yyy$b to activate one of the listed fakehosts or $bassign *$b to use the default fakehost." },
+    { "HSMSG_ASSIGNED_FAKEHOST_NOT_ACTIVE", "Fakehost $b%s.%s.$b is not active." },
+    { "HSMSG_ASSIGN_HOWTO", "Use $bset xxx.yyy$b to activate one of the listed fakehosts or $bset *$b to use the default fakehost." },
     { "HSMSG_ASSIGNED_NONE", "  None." },
     { "HSMSG_MANAGED_FAKEHOSTS", "Fakehosts managed by User $b%s$b:" },
     { "HSMSG_MANAGED_TOPLEVEL", "  $b*.%s$b   fakehosts: %d   assignments: %d" },
+    { "HSMSG_MANAGED_TOPLEVEL_OWN", "  $b*.%s$b   fakehosts: %d   assignments: %d   (active)" },
     { "HSMSG_MANAGED_FAKEHOST", "  $b%s.%s$b   assignments: %d" },
     { "HSMSG_MANAGE_HOWTO", "Use $bview xxx.yyy$b to view more information about a fakehost group." },
     { "HSMSG_UNKNOWN_FAKEHOST", "Fakehost $b%s.%s$b is unknown or you have no access to manage it." },
+    { "HSMSG_UNKNOWN_FAKEHOST_TOPLEVEL", "Fakehost $b%s$b is unknown or you have no access to manage it." },
     { "HSMSG_TOPLEVEL_FAKEHOSTS", "Fakehosts in group $b*.%s$b:" },
     { "HSMSG_TOPLEVEL_FAKEHOST", "  $b%s.%s$b   assignments: %d   managers: %d" },
+    { "HSMSG_TOPLEVEL_INVALID", "The name of the group you entered is invalid ($b%s$b)" },
     { "HSMSG_MANAGERS_TOPLEVEL", "Managers of group $b*.%s$b:" },
     { "HSMSG_MANAGERS_FAKEHOST", "Managers of group $b%s.%s$b:" },
     { "HSMSG_MANAGERS_MANAGERS", "  %s" },
     { "HSMSG_FAKEHOST_ASSIGNMENTS", "Assignments in group $b%s.%s$b:" },
     { "HSMSG_FAKEHOST_ASSIGNMENT", "  $b%s$b (%s.%s.%s)" },
     { "HSMSG_FAKEHOST_ASSIGNMENT_ACTIVE", "  $b%s$b (%s.%s.%s)   active" },
+    { "HSMSG_FAKEHOST_SET_SUCCESS", "$b%s.%s$b where set successfully." },
+    { "HSMSG_FAKEHOST_TOPLEVEL_ADDED", "Group $b%s$b successfully added." },
+    { "HSMSG_FAKEHOST_TOPLEVEL_ALREADY_EXISTS", "Group $b%s$b already exists." },
+    { "HSMSG_FAKEHOST_TOPLEVEL_DELETED", "Group $b%s$b successfully deleted." },
+    { "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_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" },
+    { "HSMSG_MANAGER_DELETED", "$b%s$b is no longer a manager of %s.%s" },
+    { "HSMSG_FAKEHOST_ASSIGN_SUCCESS", "Group $b%s.%s$b was assigned successfully." },
+    { "HSMSG_FAKEHOST_REVOKE_SUCCESS", "Group $b%s.%s$b was revoked successfully." },
     
     { NULL, NULL }
 };
@@ -80,11 +93,13 @@ static struct {
 
 const char *hostserv_module_deps[] = { NULL };
 struct userNode *hostserv;
+struct helpfile *hostserv_helpfile;
 static struct module *hostserv_module;
 static struct service *hostserv_service;
-static struct log_type *MS_LOG;
+static struct log_type *HS_LOG;
 static struct hs_toplevel *toplevels = NULL;
 static struct hs_user *hostserv_users = NULL;
+const char *title_suffix = NULL;
 
 /* FAKEHOST STRUCTS */
 struct hs_toplevel {
@@ -98,7 +113,7 @@ struct hs_secondlevel {
     struct hs_toplevel *toplevel;
     char *fakehost;
     struct hs_manager *managers;
-    struct hs_assignment *assignment;
+    struct hs_assignment *assignments;
     struct hs_secondlevel *next;
 };
 
@@ -113,6 +128,7 @@ struct hs_assignment {
 struct hs_manager {
     char type;
     void *object;
+    int active;
     struct hs_user *user;
     struct hs_manager *next;
     struct hs_manager *unext; /* for hs_user */
@@ -131,6 +147,67 @@ 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 apply_fakehost(struct handle_info *handle, struct userNode *user);
+
+static char *
+generate_fakehost(struct handle_info *handle)
+{
+    extern const char *hidden_host_suffix;
+    static char buffer[HOSTLEN+1];
+
+    if (!handle->fakehost) {
+        snprintf(buffer, sizeof(buffer), "%s.%s", handle->handle, hidden_host_suffix);
+        return buffer;
+    } else if (handle->fakehost[0] == '.') {
+        /* A leading dot indicates the stored value is actually a title. */
+        snprintf(buffer, sizeof(buffer), "%s.%s.%s", handle->handle, handle->fakehost+1, title_suffix);
+        return buffer;
+    } else if (handle->fakehost[0] == '$') {
+        /* A leading $ indicates the stored value begins with the user handle. */
+        snprintf(buffer, sizeof(buffer), "%s%s", handle->handle, handle->fakehost+1);
+        return buffer;
+    }
+    return handle->fakehost;
+}
+
+static char *
+generate_fakeident(struct handle_info *handle, struct userNode *user)
+{
+    static char buffer[USERLEN+1];
+
+    if (!handle->fakeident) {
+        if (!user)
+            return NULL;
+        safestrncpy(buffer, user->ident, sizeof(buffer));
+        return buffer;
+    }
+    return handle->fakeident;
+}
+
+static void
+apply_fakehost(struct handle_info *handle, struct userNode *user)
+{
+    struct userNode *target;
+    char *fakehost, *fakeident;
+
+    if (!handle->users)
+        return;
+
+    fakehost = generate_fakehost(handle);
+
+    if (user) {
+        fakeident = generate_fakeident(handle, user);
+        assign_fakehost(user, fakehost, fakeident, 0, 1);
+        return;
+    }
+
+    for (target = handle->users; target; target = target->next_authed) {
+        fakeident = generate_fakeident(handle, target);
+        assign_fakehost(target, fakehost, fakeident, 0, 1);
+    }
+    return;
+}
+
 static void hs_free_all() {
     struct hs_toplevel *tlfh, *next_tlfh;
     struct hs_secondlevel *slfh, *next_slfh;
@@ -167,7 +244,7 @@ static void hs_free_all() {
     hostserv_users = NULL;
 }
 
-static struct hs_toplevel *hs_add_toplevel(char *name) {
+static struct hs_toplevel *hs_add_toplevel(const char *name) {
     struct hs_toplevel *tlfh = calloc(1, sizeof(*tlfh));
     tlfh->fakehost = strdup(name);
     tlfh->next = toplevels;
@@ -187,11 +264,20 @@ static void hs_del_toplevel(struct hs_toplevel *tlfh) {
         next_slfh = slfh->next;
         hs_del_secondlevel(slfh, 0);
     }
-    free(tlfh->fakehost);
-    free(tlfh);
+    
+    struct hs_toplevel *ctlfh;
+    for(ctlfh = toplevels; ctlfh; ctlfh = ctlfh->next) {
+       if(ctlfh->next == tlfh) {
+               ctlfh->next = tlfh->next;
+       } else if(ctlfh == tlfh) {
+               ctlfh = tlfh;
+       }
+    }
+    /*free(tlfh->fakehost);
+    free(tlfh);*/
 }
 
-static struct hs_secondlevel *hs_add_secondlevel(struct hs_toplevel *tlfh, char *name) {
+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;
     slfh->fakehost = strdup(name);
@@ -258,7 +344,7 @@ static void hs_del_manager(struct hs_manager *manager, int remove_from_object) {
         if(manager->type == 1) {
             struct hs_toplevel *tlfh = manager->object;
             for(cmanager = tlfh->managers; cmanager; cmanager = cmanager->next) {
-                if(cmanager = manager) {
+                if(cmanager == manager) {
                     if(prev_manager)
                         prev_manager->next = manager->next;
                     else
@@ -270,7 +356,7 @@ static void hs_del_manager(struct hs_manager *manager, int remove_from_object) {
         } else if(manager->type == 2) {
             struct hs_secondlevel *slfh = manager->object;
             for(cmanager = slfh->managers; cmanager; cmanager = cmanager->next) {
-                if(cmanager = manager) {
+                if(cmanager == manager) {
                     if(prev_manager)
                         prev_manager->next = manager->next;
                     else
@@ -299,6 +385,28 @@ static void hs_del_manager(struct hs_manager *manager, int remove_from_object) {
     free(manager);
 }
 
+static void activateAssignment(struct hs_assignment *assignment) {
+       struct hs_toplevel *tlfh;
+       struct hs_secondlevel *slfh;
+       struct hs_user *hs_user;
+       struct hs_assignment *assgn;
+       char fakehost[140];
+       char *prefix = "$";
+       
+       hs_user = assignment->user;
+       if(hs_user->assignments) {
+               for(assgn = hs_user->assignments; assgn; assgn = assgn->unext) {
+                       assgn->active = 0;
+               }
+       }
+       slfh = assignment->secondlevel;
+       tlfh = slfh->toplevel;
+       sprintf(fakehost, "%s.%s.%s", prefix, slfh->fakehost, tlfh->fakehost);
+       hs_user->hi->fakehost = strdup(fakehost);
+       apply_fakehost(hs_user->hi, NULL);
+       assignment->active = 1;
+}
+
 static struct hs_assignment *hs_add_assignment(struct hs_secondlevel *slfh, struct hs_user *user) {
     struct hs_assignment *assignment = calloc(1, sizeof(*assignment));
     assignment->secondlevel = slfh;
@@ -310,7 +418,7 @@ static struct hs_assignment *hs_add_assignment(struct hs_secondlevel *slfh, stru
     assignment->unext = user->assignments;
     user->assignments = assignment;
     if(assignment->active) {
-        /* use this assignment */
+        activateAssignment(assignment);
     }
     return assignment;
 }
@@ -343,8 +451,13 @@ static void hs_del_assignment(struct hs_assignment *assignment, int remove_from_
         }
         if(assignment->user->managements == NULL && assignment->user->assignments == NULL)
             hs_del_user(assignment->user);
+        
         if(assignment->active) {
-            /* use other assignment */
+            struct handle_info *hi;
+            
+            hi = assignment->user->hi;
+            hi->fakehost = NULL;
+            apply_fakehost(hi, NULL);
         }
     }
     free(assignment);
@@ -397,7 +510,7 @@ static void hs_del_user(struct hs_user *user) {
 
 /* END OF MANAGEMENT FUNCTIONS */
 
-static int check_management_access(struct handle_info *hi, struct hs_toplevel *tlfh, struct hs_toplevel *slfh) {
+static int check_management_access(struct handle_info *hi, struct hs_toplevel *tlfh, struct hs_secondlevel *slfh) {
     if(!hi) 
         return 0;
     if(hi->opserv_level >= hostserv_conf.toplevel_access) 
@@ -407,14 +520,16 @@ static int check_management_access(struct handle_info *hi, struct hs_toplevel *t
         return 0;
     struct hs_manager *manager;
     if(slfh) {
-        for(manager = huser->managements; manager; manager = manager->next) {
+        for(manager = user->managements; manager; manager = manager->next) {
             if(manager->type == 2 && manager->object == slfh) 
                 return 1;
         }
     }
-    for(manager = huser->managements; manager; manager = manager->next) {
-        if(manager->type == 1 && manager->object == tlfh) 
-            return 1;
+    if(tlfh) {
+           for(manager = user->managements; manager; manager = manager->next) {
+               if(manager->type == 1 && manager->object == tlfh) 
+                   return 1;
+           }
     }
     return 0;
 }
@@ -433,7 +548,7 @@ static void cmd_view_toplevel_information(UNUSED_ARG(struct userNode *user), UNU
             managers++;
         struct hs_assignment *assignment;
         int assignments = 0;
-        for(assignment = slfh->assignment; assignment; assignment = assignment->next)
+        for(assignment = slfh->assignments; assignment; assignment = assignment->next)
             assignments++;
         reply("HSMSG_TOPLEVEL_FAKEHOST", slfh->fakehost, tlfh->fakehost, assignments, managers);
     }
@@ -458,12 +573,12 @@ static void cmd_view_toplevel_information(UNUSED_ARG(struct userNode *user), UNU
 static void cmd_view_secondlevel_information(UNUSED_ARG(struct userNode *user), UNUSED_ARG(struct svccmd *cmd), struct hs_secondlevel *slfh) {
     reply("HSMSG_FAKEHOST_ASSIGNMENTS", slfh->fakehost, slfh->toplevel->fakehost);
     struct hs_assignment *assignment;
-    for(assignment = slfh->assignment; assignment; assignment = assignment->next) {
+    for(assignment = slfh->assignments; assignment; assignment = assignment->next) {
         reply((assignment->active ? "HSMSG_FAKEHOST_ASSIGNMENT_ACTIVE" : "HSMSG_FAKEHOST_ASSIGNMENT"), assignment->user->hi->handle, assignment->user->hi->handle, slfh->fakehost, slfh->toplevel->fakehost);
     }
     reply("HSMSG_MANAGERS_FAKEHOST", slfh->fakehost, slfh->toplevel->fakehost);
     struct hs_manager *cmanager;
-    if(!tlfh->managers)
+    if(!slfh->managers)
         reply("HSMSG_ASSIGNED_NONE");
     else {
         char managerBuf[351];
@@ -479,12 +594,117 @@ static void cmd_view_secondlevel_information(UNUSED_ARG(struct userNode *user),
     }
 }
 
+static MODCMD_FUNC(cmd_addhost) {
+       struct handle_info *hi;
+       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);
+       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(hi->opserv_level >= hostserv_conf.toplevel_access) {
+               struct hs_toplevel *tlfh;
+           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);
+               return 0;
+           }
+           hs_add_toplevel(tlfh_name);
+           reply("HSMSG_FAKEHOST_TOPLEVEL_ADDED", tlfh_name);
+           return 1;
+           }
+           reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+        return 0;
+       } else {
+           struct hs_secondlevel *slfh;
+           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);
+               return 0;
+           }
+           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(hi, tlfh, NULL)) {
+               reply("HSMSG_FAKEHOST_SECONDLEVEL_ALREADY_EXISTS", slfh_name, tlfh_name);
+               return 0;
+           }
+           hs_add_secondlevel(tlfh, slfh_name);
+           reply("HSMSG_FAKEHOST_SECONDLEVEL_ADDED", slfh_name, tlfh_name);
+       }
+       return 0;
+}
+
+static MODCMD_FUNC(cmd_delhost) {
+       struct handle_info *hi;
+       if (!(hi = user->handle_info)) {
+        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);
+        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);
+        return 0;
+    }
+    if(!irccasecmp(slfh_name, "*")) {
+           if(hi->opserv_level < hostserv_conf.toplevel_access) {
+               reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+               return 0;
+           }
+           hs_del_toplevel(tlfh);
+           reply("HSMSG_FAKEHOST_TOPLEVEL_DELETED", tlfh_name);
+           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, NULL)) {
+               reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+               return 0;
+           }
+           hs_del_secondlevel(slfh, 1);
+           reply("HSMSG_FAKEHOST_SECONDLEVEL_DELETED", slfh_name, tlfh_name);
+       }
+       return 0;
+}
 
 static MODCMD_FUNC(cmd_view) {
     struct handle_info *hi;
     if(argc >= 2 && !strchr(argv[1], '.')) {
         if (!(hi = modcmd_get_handle_info(user, argv[1])))
-            return 0
+            return 0;
     } else if(argc >= 2) {
         if (!(hi = user->handle_info)) {
             reply("NSMSG_MUST_AUTH");
@@ -503,12 +723,12 @@ static MODCMD_FUNC(cmd_view) {
             if(!irccasecmp(tlfh->fakehost, tlfh_name)) break;
         }
         if(!tlfh) {
-            reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+               reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
             return 0;
         }
         if(!irccasecmp(slfh_name, "*")) {
             if(!check_management_access(hi, tlfh, NULL)) {
-                reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+               reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
                 return 0;
             }
             cmd_view_toplevel_information(user, cmd, tlfh);
@@ -519,7 +739,7 @@ static MODCMD_FUNC(cmd_view) {
                 if(!irccasecmp(slfh->fakehost, slfh_name)) break;
             }
             if(!slfh || !check_management_access(hi, tlfh, slfh)) {
-                reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+               reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
                 return 0;
             }
             cmd_view_secondlevel_information(user, cmd, slfh);
@@ -553,7 +773,7 @@ static MODCMD_FUNC(cmd_view) {
             int slfhs = 0, assignments = 0;
             for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
                 slfhs++;
-                for(assignment = slfh->assignment; assignment; assignment = assignment->next)
+                for(assignment = slfh->assignments; assignment; assignment = assignment->next)
                     assignments++;
             }
             reply("HSMSG_MANAGED_TOPLEVEL", tlfh->fakehost, slfhs, assignments);
@@ -562,7 +782,7 @@ static MODCMD_FUNC(cmd_view) {
     } else if(huser && huser->managements) {
         reply("HSMSG_MANAGED_FAKEHOSTS", hi->handle);
         struct hs_manager *manager;
-        for(manager = huser->managements; manager; manager = manager->next) {
+        for(manager = huser->managements; manager; manager = manager->unext) {
             if(manager->type == 1) {
                 struct hs_toplevel *tlfh = manager->object;
                 struct hs_secondlevel *slfh;
@@ -570,7 +790,7 @@ static MODCMD_FUNC(cmd_view) {
                 int slfhs = 0, assignments = 0;
                 for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
                     slfhs++;
-                    for(assignment = slfh->assignment; assignment; assignment = assignment->next)
+                    for(assignment = slfh->assignments; assignment; assignment = assignment->next)
                         assignments++;
                 }
                 reply("HSMSG_MANAGED_TOPLEVEL", tlfh->fakehost, slfhs, assignments);
@@ -588,7 +808,7 @@ static MODCMD_FUNC(cmd_view) {
                 if(cmanager) continue;
                 struct hs_assignment *assignment;
                 int assignments = 0;
-                for(assignment = slfh->assignment; assignment; assignment = assignment->next)
+                for(assignment = slfh->assignments; assignment; assignment = assignment->next)
                     assignments++;
                 reply("HSMSG_MANAGED_FAKEHOST", slfh->fakehost, tlfh->fakehost, assignments);
             }
@@ -600,20 +820,99 @@ static MODCMD_FUNC(cmd_view) {
 }
 
 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);
+               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);
+               return 0;
+           }
+           if(!irccasecmp(slfh_name, "*")) {
+               if(!check_management_access(user->handle_info, tlfh, NULL)) {
+                   reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+                   return 0;
+               }
+           } else {
+               for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
+                   if(!irccasecmp(slfh->fakehost, slfh_name)) break;
+               }
+               if(!slfh || !check_management_access(user->handle_info, tlfh, slfh)) {
+                   reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+                   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;
+                   }
+               }
+           }
+           for(manager = huser->managements; manager; manager = manager->next) {
+               if(manager->type == 1 && manager->object == tlfh) {
+                   reply("HSMSG_MANAGER_ALREADY", hi->handle, "*", 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;
+}
+
+static MODCMD_FUNC(cmd_delmanager) {
     struct handle_info *hi;
     char *fakehost;
     if(!strchr(argv[1], '.')) {
         if (!(hi = modcmd_get_handle_info(user, argv[1])))
-            return 0
+            return 0;
         fakehost = argv[2];
     } else {
         if (!(hi = modcmd_get_handle_info(user, argv[2])))
-            return 0
+            return 0;
         fakehost = argv[1];
     }
+    if(!fakehost) {
+       reply("HSMSG_ASSIGNED_NONE");
+       return 0;
+    }
     char *slfh_name = fakehost;
     char *tlfh_name = strchr(fakehost, '.');
-    *tlfh_name = '\0';
+    if(tlfh_name) {
+       *tlfh_name = '\0';
+    } else {
+       reply("HSMSG_ASSIGNED_NONE");
+       return 0;
+    }
     tlfh_name++;
     if(strchr(tlfh_name, '.')) {
         reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
@@ -642,107 +941,430 @@ static MODCMD_FUNC(cmd_addmanager) {
             return 0;
         }
     }
-    struct hs_user *huser = hs_get_user(hi, 1);
+    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);
+        return 0;
+    }
     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;
-            }
+            if(manager->type == 2 && manager->object == slfh) 
+                break;
         }
-    }
-    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) {
+            reply("HSMSG_MANAGER_NOT", hi->handle, slfh_name, tlfh_name);
+            return 0;
+        }
+    } else {
+        for(manager = huser->managements; manager; manager = manager->next) {
+            if(manager->type == 1 && manager->object == tlfh) 
+                break;
+        }
+        if(!manager) {
+            reply("HSMSG_MANAGER_NOT", hi->handle, "*", 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);
+    hs_del_manager(manager, 1);
+    reply("HSMSG_MANAGER_DELETED", hi->handle, slfh_name, tlfh_name);
+    return 1;
 }
 
-static MODCMD_FUNC(cmd_delmanager) {
-    struct handle_info *hi;
+static MODCMD_FUNC(cmd_set) {
+       struct handle_info *hi;
+       struct hs_user *hs_user;
+       struct hs_assignment *assignment;
+       struct hs_assignment *assgn;
+       struct hs_toplevel *tlfh;
+       struct hs_secondlevel *slfh;
+       char *fakehost;
+       
+       if (!(hi = user->handle_info)) {
+               reply("NSMSG_MUST_AUTH");
+           return 0;
+       }
+       hs_user = hs_get_user(hi, 0);
+       if(!strcmp(argv[1], "*")) {
+               hi->fakehost = NULL;
+               apply_fakehost(hi, NULL);
+               if(hs_user->assignments) {
+                       for(assgn = hs_user->assignments; assgn; assgn = assgn->unext) {
+                               assgn->active = 0;
+                       }
+               }
+               return 1;
+       } else {
+               if(!strchr(argv[1], '.')) {
+               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);
+               return 0;
+           }
+               for(assignment = hs_user->assignments; assignment; assignment = assignment->unext) {
+                       slfh = assignment->secondlevel;
+                       tlfh = slfh->toplevel;
+                       if(!irccasecmp(slfh_name, slfh->fakehost)) {
+                               if(!irccasecmp(tlfh_name, tlfh->fakehost)) {
+                                       activateAssignment(assignment);
+                                       reply("HSMSG_FAKEHOST_SET_SUCCESS", slfh->fakehost, tlfh->fakehost);
+                                       return 1;
+                               }
+                       }
+               }
+               reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+               return 0;
+       }
+}
+
+static MODCMD_FUNC(cmd_assign) {
+       struct handle_info *hi;
+       struct handle_info *hiuser;
     char *fakehost;
     if(!strchr(argv[1], '.')) {
         if (!(hi = modcmd_get_handle_info(user, argv[1])))
-            return 0
+            return 0;
         fakehost = argv[2];
     } else {
         if (!(hi = modcmd_get_handle_info(user, argv[2])))
-            return 0
+            return 0;
         fakehost = argv[1];
     }
+    if (!(hiuser = user->handle_info)) {
+               reply("NSMSG_MUST_AUTH");
+           return 0;
+       }
+    if(!fakehost) {
+       reply("HSMSG_ASSIGNED_NONE");
+       return 0;
+    }
     char *slfh_name = fakehost;
     char *tlfh_name = strchr(fakehost, '.');
-    *tlfh_name = '\0';
+    if(tlfh_name) {
+       *tlfh_name = '\0';
+    } else {
+       reply("HSMSG_ASSIGNED_NONE");
+       return 0;
+    }
     tlfh_name++;
     if(strchr(tlfh_name, '.')) {
         reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
         return 0;
     }
-    struct hs_toplevel *tlfh;
-    struct hs_secondlevel *slfh = NULL;
+    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->fakehost, tlfh_name)) break;
+       if(!irccasecmp(tlfh_name, tlfh->fakehost)) {
+               for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
+                       if(!irccasecmp(slfh_name, slfh->fakehost)) {
+                                       if(check_management_access(hiuser, tlfh, slfh)) {
+                                               hs_add_assignment(slfh, hs_user);
+                                               reply("HSMSG_FAKEHOST_ASSIGN_SUCCESS", slfh_name, tlfh_name);
+                                               return 1;
+                                       }
+                                       reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+                                       return 0;
+                       }
+               }
+       }
     }
-    if(!tlfh) {
-        reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
-        return 0;
-    }
-    if(!irccasecmp(slfh_name, "*")) {
-        if(!check_management_access(user->handle_info, tlfh, NULL)) {
-            reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+    reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+    return 0;
+}
+
+static MODCMD_FUNC(cmd_revoke) {
+       struct handle_info *hi;
+       struct handle_info *hiuser;
+    char *fakehost;
+    if(!strchr(argv[1], '.')) {
+        if (!(hi = modcmd_get_handle_info(user, argv[1])))
             return 0;
-        }
+        fakehost = argv[2];
     } else {
-        for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
-            if(!irccasecmp(slfh->fakehost, slfh_name)) break;
-        }
-        if(!slfh || !check_management_access(user->handle_info, tlfh, slfh)) {
-            reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+        if (!(hi = modcmd_get_handle_info(user, argv[2])))
             return 0;
-        }
+        fakehost = argv[1];
     }
-    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);
-        return 0;
+    if (!(hiuser = user->handle_info)) {
+               reply("NSMSG_MUST_AUTH");
+           return 0;
+       }
+    if(!fakehost) {
+       reply("HSMSG_ASSIGNED_NONE");
+       return 0;
     }
-    if(slfh) {
-        for(manager = huser->managements; manager; manager = manager->next) {
-            if(manager->type == 2 && manager->object == slfh) 
-                break;
-        }
-        if(!manager) {
-            reply("HSMSG_MANAGER_NOT", hi->handle, slfh_name, tlfh_name);
-            return 0;
-        }
+    char *slfh_name = fakehost;
+    char *tlfh_name = strchr(fakehost, '.');
+    if(tlfh_name) {
+       *tlfh_name = '\0';
     } else {
-        for(manager = huser->managements; manager; manager = manager->next) {
-            if(manager->type == 1 && manager->object == tlfh) 
-                break;
+       reply("HSMSG_ASSIGNED_NONE");
+       return 0;
+    }
+    tlfh_name++;
+    if(strchr(tlfh_name, '.')) {
+        reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+        return 0;
+    }
+    struct hs_assignment *assignment;
+    struct hs_user *hs_user = hs_get_user(hi, 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(hi, assignment->secondlevel->toplevel, assignment->secondlevel)) {
+                               hs_del_assignment(assignment, 1);
+                               reply("HSMSG_FAKEHOST_REVOKE_SUCCESS", slfh_name, tlfh_name);
+                               return 1;
+                       }
+                       reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+                       return 0;
+               }
+       }
+    }
+    reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
+    return 0;
+}
+
+static void hostserv_conf_read(void)
+{
+    dict_t conf_node;
+    const char *str;
+
+    str = "modules/hostserv";
+    if (!(conf_node = conf_get_data(str, RECDB_OBJECT))) {
+        log_module(HS_LOG, LOG_ERROR, "config node `%s' is missing or has wrong type.", str);
+        return;
+    }
+
+    str = database_get_data(conf_node, "nick", RECDB_QSTRING);
+    if(hostserv_conf.nick && strcmp(hostserv_conf.nick, str)) {
+        //nick changed
+    }
+    hostserv_conf.nick = str;
+    
+    str = database_get_data(conf_node, "modes", RECDB_QSTRING);
+    hostserv_conf.modes = (str ? str : NULL);
+    
+    str = database_get_data(conf_node, "toplevel_access", RECDB_QSTRING);
+    unsigned int toplevel_access = atoi(str);
+    hostserv_conf.toplevel_access = (toplevel_access ? toplevel_access : 600);
+    
+    /*str = database_get_data(conf_node, "description", RECDB_QSTRING);
+    hostserv_conf.description = (str ? str : NULL);*/
+       str = database_get_data(conf_node, KEY_TITLEHOST_SUFFIX, RECDB_QSTRING);
+    title_suffix = str ? str : "example.net";
+}
+
+static int hostserv_saxdb_read_secondlevel(const char *name, void *data, UNUSED_ARG(void *extra));
+static int hostserv_saxdb_read_assignments(const char *name, void *data, UNUSED_ARG(void *extra));
+
+static int hostserv_saxdb_read_toplevel(const char *name, void *data, UNUSED_ARG(void *extra)) {
+    struct record_data *rd = data;
+    struct hs_toplevel *tlfh;
+    struct hs_manager *managerTL;
+    struct hs_user *user;
+    struct dict *object;
+
+     if (rd->type == RECDB_OBJECT) {
+        dict_t db = GET_RECORD_OBJECT(rd);
+        dict_iterator_t it;
+        
+        tlfh = hs_add_toplevel(name);
+        
+        if ((object = database_get_data(db, KEY_MANAGERS, RECDB_OBJECT))) {
+            for (it = dict_first(object); it; it = iter_next(it)) {
+                user = hs_get_user(get_handle_info(iter_key(it)), 1);
+                //rd = iter_data(it);
+                /* nothing in here, yet */
+                managerTL = hs_add_manager_toplevel(tlfh, user);
+                if (database_get_data(db, KEY_ACTIVE, RECDB_QSTRING))
+                       managerTL->active = 1;
+                else
+                       managerTL->active = 0;
+            }
         }
-        if(!manager) {
-            reply("HSMSG_MANAGER_NOT", hi->handle, "*", tlfh_name);
-            return 0;
+        
+        if ((object = database_get_data(db, KEY_SECONDLEVEL, RECDB_OBJECT)))
+            dict_foreach(object, hostserv_saxdb_read_secondlevel, tlfh);
+    }
+    return 0;
+}
+
+static int hostserv_saxdb_read_secondlevel(const char *name, void *data, UNUSED_ARG(void *extra)) {
+    struct record_data *rd = data;
+    struct hs_toplevel *tlfh = extra;
+    struct hs_secondlevel *slfh;
+    struct hs_manager *managerSL;
+    struct hs_user *user;
+    struct dict *object;
+
+    if (rd->type == RECDB_OBJECT) {
+        dict_t db = GET_RECORD_OBJECT(rd);
+        dict_iterator_t it;
+        
+        slfh = hs_add_secondlevel(tlfh, name);
+        
+        if ((object = database_get_data(db, KEY_MANAGERS, RECDB_OBJECT))) {
+            for (it = dict_first(object); it; it = iter_next(it)) {
+                user = hs_get_user(get_handle_info(iter_key(it)), 1);
+                //rd = iter_data(it);
+                /* nothing in here, yet */
+                managerSL = hs_add_manager_secondlevel(slfh, user);
+                if (database_get_data(db, KEY_ACTIVE, RECDB_QSTRING))
+                       managerSL->active = 1;
+                else
+                       managerSL->active = 0;
+            }
         }
+        
+        if ((object = database_get_data(db, KEY_ASSIGNMENTS, RECDB_OBJECT)))
+            dict_foreach(object, hostserv_saxdb_read_assignments, slfh);
     }
-    hs_del_manager(manager, 1);
-    reply("HSMSG_MANAGER_DELETED", hi->handle, slfh_name, tlfh_name);
+    return 0;
 }
 
+static int hostserv_saxdb_read_assignments(const char *name, void *data, UNUSED_ARG(void *extra)) {
+    struct record_data *rd = data;
+    struct hs_secondlevel *slfh = extra;
+    struct hs_user *user;
+    struct hs_assignment *assng;
+    
+    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);
+        
+        if (database_get_data(db, KEY_ACTIVE, RECDB_QSTRING))
+            assng->active = 1;
+        else
+            assng->active = 0;
+    }
+    
+    return 0;
+}
+
+static int
+hostserv_saxdb_read(struct dict *db)
+{
+    struct dict *object;
+
+    if ((object = database_get_data(db, KEY_TOPLEVEL, RECDB_OBJECT)))
+        dict_foreach(object, hostserv_saxdb_read_toplevel, NULL);
+
+    return 1;
+}
 
+static int
+hostserv_saxdb_write(struct saxdb_context *ctx)
+{
+    struct hs_toplevel *tlfh;
+    struct hs_secondlevel *slfh;
+    struct hs_assignment *assng;
+    struct hs_manager *manager;
 
+    saxdb_start_record(ctx, KEY_TOPLEVEL, 1);
+    for(tlfh = toplevels; tlfh; tlfh = tlfh->next) {
+        saxdb_start_record(ctx, tlfh->fakehost, 1);
+        
+        saxdb_start_record(ctx, KEY_MANAGERS, 1);
+        for(manager = tlfh->managers; manager; manager = manager->next) {
+            saxdb_start_record(ctx, manager->user->hi->handle, 0);
+            //additional manager information?
+            if(manager->active)
+               saxdb_write_int(ctx, KEY_ACTIVE, manager->active);
+            saxdb_end_record(ctx);
+        }
+        saxdb_end_record(ctx);
+        
+        saxdb_start_record(ctx, KEY_SECONDLEVEL, 1);
+        for(slfh = tlfh->secondlevel; slfh; slfh = slfh->next) {
+            saxdb_start_record(ctx, slfh->fakehost, 1);
+            
+            saxdb_start_record(ctx, KEY_MANAGERS, 1);
+            for(manager = slfh->managers; manager; manager = manager->next) {
+                saxdb_start_record(ctx, manager->user->hi->handle, 0);
+                //additional manager information?
+                if(manager->active)
+                       saxdb_write_int(ctx, KEY_ACTIVE, manager->active);
+                saxdb_end_record(ctx);
+            }
+            saxdb_end_record(ctx);
+            
+            saxdb_start_record(ctx, KEY_ASSIGNMENTS, 1);
+            for(assng = slfh->assignments; assng; assng = assng->next) {
+                saxdb_start_record(ctx, assng->user->hi->handle, 0);
+                //additional assignment information?
+                if(assng->active)
+                    saxdb_write_int(ctx, KEY_ACTIVE, assng->active);
+                saxdb_end_record(ctx);
+            }
+            saxdb_end_record(ctx);
+            
+            saxdb_end_record(ctx);
+        }
+        saxdb_end_record(ctx);
+        
+        saxdb_end_record(ctx);
+    }
+    saxdb_end_record(ctx);
+    
+    return 0;
+}
 
 
+static void hostserv_db_cleanup(void) {
+    hs_free_all();
+}
 
+int hostserv_init() {
+       HS_LOG = log_register_type("HostServ", "file:hostserv.log");
+    
+       const char *nick, *modes;
+       if((nick = conf_get_data("modules/hostserv/nick", RECDB_QSTRING))) {
+               modes = conf_get_data("modules/hostserv/modes", RECDB_QSTRING);
+           hostserv = AddLocalUser(nick, nick, NULL, "Host Service", modes);
+           hostserv_service = service_register(hostserv);
+           hostserv_service->trigger = '*';
+       }
+               
+       conf_register_reload(hostserv_conf_read);
+       reg_exit_func(hostserv_db_cleanup);
+       saxdb_register("HostServ", hostserv_saxdb_read, hostserv_saxdb_write);
+       hostserv_module = module_register("HostServ", HS_LOG, "mod-hostserv.help", NULL);
+       modcmd_register(hostserv_module, "view", cmd_view, 0, MODCMD_REQUIRE_AUTHED, NULL);
+       modcmd_register(hostserv_module, "addmanager", cmd_addmanager, 3, MODCMD_REQUIRE_AUTHED, NULL);
+       modcmd_register(hostserv_module, "delmanager", cmd_delmanager, 3, MODCMD_REQUIRE_AUTHED, NULL);
+       modcmd_register(hostserv_module, "set", cmd_set, 2, MODCMD_REQUIRE_AUTHED, NULL);
+       modcmd_register(hostserv_module, "assign", cmd_assign, 3, MODCMD_REQUIRE_AUTHED, NULL);
+       modcmd_register(hostserv_module, "revoke", cmd_revoke, 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);
+       message_register_table(msgtab);
+       return 1;
+}
 
-/* to be continued - some day in the future - maybe? */
+int hostserv_finalize(void) {
+       dict_t conf_node;
+       const char *str;
 
+    str = "modules/hostserv";
+    if (!(conf_node = conf_get_data(str, RECDB_OBJECT))) {
+        log_module(HS_LOG, LOG_ERROR, "config node `%s' is missing or has wrong type.", str);
+        return 0;
+    }
 
+    str = database_get_data(conf_node, "nick", RECDB_QSTRING);
+    if (str) hostserv_conf.nick = str;
+    
+    str = database_get_data(conf_node, "modes", RECDB_QSTRING);
+    if (str) hostserv_conf.modes = str; 
+    return 1;
+}
\ No newline at end of file