X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/69517d70a43539579b0a99ae1181e4137383041f..b8036263460c7bb538684caafa7309c360734155:/src/nickserv.h diff --git a/src/nickserv.h b/src/nickserv.h index 0c0fb83..5a2fb89 100644 --- a/src/nickserv.h +++ b/src/nickserv.h @@ -41,9 +41,10 @@ struct svccmd; #define HI_FLAG_NETWORK_HELPER 0x00000100 #define HI_FLAG_BOT 0x00000200 #define HI_FLAG_AUTOHIDE 0x00000400 -#define HI_FLAG_ADVANCED 0x00000800 +#define HI_FLAG_IMPERSONATE 0x00000800 +#define HI_FLAG_ADVANCED 0x00001000 /* Flag characters for the above. First char is LSB, etc. */ -#define HANDLE_FLAGS "SphgscfnHbx" +#define HANDLE_FLAGS "SphgscfnHbxI" /* HI_STYLE_* go into handle_info.userlist_style */ #define HI_STYLE_NORMAL 'n' @@ -92,6 +93,7 @@ struct handle_note { struct handle_info { struct nick_info *nicks; struct string_list *masks; + struct string_list *sslfps; struct string_list *ignores; struct userNode *users; struct userData *channels; @@ -121,6 +123,8 @@ struct nick_info { struct handle_info *owner; struct nick_info *next; /* next nick owned by same handle */ char nick[NICKLEN+1]; + time_t registered; + time_t lastseen; }; struct handle_info_list { @@ -150,6 +154,7 @@ struct nickserv_config { unsigned int warn_nick_owned : 1; unsigned int warn_clone_auth : 1; unsigned int sync_log : 1; + unsigned int expire_nicks : 1; unsigned long nicks_per_handle; unsigned long password_min_length; unsigned long password_min_digits; @@ -168,6 +173,8 @@ struct nickserv_config { unsigned long set_fakehost_level; unsigned long handles_per_email; unsigned long email_search_level; + unsigned long nick_expire_frequency; + unsigned long nick_expire_delay; const char *network_name; const char *titlehost_suffix; regex_t valid_handle_regex; @@ -184,8 +191,8 @@ struct nickserv_config { unsigned long ounregister_flags; const char *auto_oper; const char *auto_admin; - char *auto_oper_privs; - char *auto_admin_privs; + const char *auto_oper_privs; + const char *auto_admin_privs; char default_style; struct string_list *denied_fakehost_words; unsigned int force_handles_lowercase; @@ -202,6 +209,7 @@ struct nickserv_config { const char *ldap_field_account; const char *ldap_field_password; const char *ldap_field_email; + const char *ldap_field_oslevel; struct string_list *ldap_object_classes; const char *ldap_oper_group_dn; unsigned int ldap_oper_group_level; @@ -222,40 +230,40 @@ int oper_has_access(struct userNode *user, struct userNode *bot, unsigned int mi void nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd); struct handle_info *get_victim_oper(struct userNode *user, const char *target); -struct handle_info *loc_auth(char *handle, char *password, char *userhost); +struct handle_info *loc_auth(char *sslfp, char *handle, char *password, char *userhost); -typedef void (*user_mode_func_t)(struct userNode *user, const char *mode_change); -void reg_user_mode_func(user_mode_func_t func); -typedef void (*channel_mode_func_t)(struct userNode *who, struct chanNode *channel, char **mode, unsigned int argc); -void reg_channel_mode_func(channel_mode_func_t func); +typedef void (*user_mode_func_t)(struct userNode *user, const char *mode_change, void *extra); +void reg_user_mode_func(user_mode_func_t func, void *extra); +typedef void (*channel_mode_func_t)(struct userNode *who, struct chanNode *channel, char **mode, unsigned int argc, void *extra); +void reg_channel_mode_func(channel_mode_func_t func, void *extra); /* auth_funcs are called when a user gets a new handle_info. They are * called *after* user->handle_info has been updated. */ -typedef void (*auth_func_t)(struct userNode *user, struct handle_info *old_handle); -void reg_auth_func(auth_func_t func); +typedef void (*auth_func_t)(struct userNode *user, struct handle_info *old_handle, void *extra); +void reg_auth_func(auth_func_t func, void *extra); /* Called just after a handle is renamed. */ -typedef void (*handle_rename_func_t)(struct handle_info *handle, const char *old_handle); -void reg_handle_rename_func(handle_rename_func_t func); +typedef void (*handle_rename_func_t)(struct handle_info *handle, const char *old_handle, void *extra); +void reg_handle_rename_func(handle_rename_func_t func, void *extra); /* unreg_funcs are called right before a handle is unregistered. * `user' is the person who caused the handle to be unregistered (either a * client authed to the handle, or an oper). */ -typedef void (*unreg_func_t)(struct userNode *user, struct handle_info *handle); -void reg_unreg_func(unreg_func_t func); +typedef void (*unreg_func_t)(struct userNode *user, struct handle_info *handle, void *extra); +void reg_unreg_func(unreg_func_t func, void *extra); /* Called just before a handle is merged */ -typedef void (*handle_merge_func_t)(struct userNode *user, struct handle_info *handle_to, struct handle_info *handle_from); -void reg_handle_merge_func(handle_merge_func_t); +typedef void (*handle_merge_func_t)(struct userNode *user, struct handle_info *handle_to, struct handle_info *handle_from, void *extra); +void reg_handle_merge_func(handle_merge_func_t, void *extra); /* Called after an allowauth. handle is null if allowauth authorization was * removed */ -typedef void (*allowauth_func_t)(struct userNode *user, struct userNode *target, struct handle_info *handle); -void reg_allowauth_func(allowauth_func_t func); +typedef void (*allowauth_func_t)(struct userNode *user, struct userNode *target, struct handle_info *handle, void *extra); +void reg_allowauth_func(allowauth_func_t func, void *extra); /* Called when an auth attempt fails because of a bad password */ -typedef void (*failpw_func_t)(struct userNode *user, struct handle_info *handle); -void reg_failpw_func(failpw_func_t func); +typedef void (*failpw_func_t)(struct userNode *user, struct handle_info *handle, void *extra); +void reg_failpw_func(failpw_func_t func, void *extra); void send_func_list(struct userNode *user);