Changeset 1681

Timestamp:

02/17/10 16:52:56 (7 months ago)

Author:

swalsh

Message:

add support for the new ircd AUTH command

Location:

trunk

Files:

• include/interface.h (modified) (3 diffs)
• modules/nickserv.c (modified) (5 diffs)
• modules/oftc.c (modified) (13 diffs)
• src/interface.c (modified) (8 diffs)

trunk/include/interface.h

@@ -54 +54 @@
 extern struct Callback *send_chops_notice_cb;
 extern struct Callback *send_squit_cb;
+extern struct Callback *send_autojoin_cb;
+extern struct Callback *send_auth_cb;
 
 extern struct Callback *on_umode_change_cb;
@@ -79 +81 @@
 extern struct Callback *on_db_init_cb;
 extern struct Callback *on_ctcp_cb;
+extern struct Callback *on_auth_request_cb;
 
 extern struct Callback *do_event_cb;
@@ -114 +117 @@
 void send_kill(struct Service *, struct Client *, const char *);
 void set_limit(struct Service *, struct Channel *, int);
+void send_auth_reply(struct Service *, char *, char *, int, char *);
 
 unsigned int enforce_mode_lock(struct Service *, struct Channel *, const char *, char *,

trunk/modules/nickserv.c

@@ -53 +53 @@
 static dlink_node *ns_quit_hook;
 static dlink_node *ns_certfp_hook;
+static dlink_node *ns_on_auth_req_hook;
 
 static dlink_list nick_enforce_list = { NULL, NULL, 0 };
@@ -67 +68 @@
 static void *ns_on_quit(va_list);
 static void *ns_on_certfp(va_list);
+static void *ns_on_auth_requested(va_list);
 static void m_drop(struct Service *, struct Client *, int, char *[]);
 static void m_help(struct Service *, struct Client *, int, char *[]);
@@ -304 +306 @@
   ns_quit_hook        = install_hook(on_quit_cb, ns_on_quit);
   ns_certfp_hook      = install_hook(on_certfp_cb, ns_on_certfp);
+  ns_on_auth_req_hook = install_hook(on_auth_request_cb, ns_on_auth_requested);
   
   guest_number = 0;
@@ -319 +322 @@
   uninstall_hook(on_quit_cb, ns_on_quit);
   uninstall_hook(on_certfp_cb, ns_on_certfp);
+  uninstall_hook(on_auth_request_cb, ns_on_auth_requested);
   eventDelete(process_enforce_list, NULL);
   eventDelete(process_release_list, NULL);
@@ -2036 +2040 @@
 }
 
+static void *
+ns_on_auth_requested(va_list args)
+{
+  char *user    = va_arg(args, char *);
+  char *n       = va_arg(args, char *);
+  char *certfp  = va_arg(args, char *);
+  Nickname *nick, *nick2;
+
+  nick = nickname_find(user);
+  if(nick == NULL)
+  {
+    send_auth_reply(nickserv, user, n, 0, "User not found");
+  }
+  else
+  {
+    nick2 = nickname_find(n);
+    if(nick2 == NULL)
+    {
+      nickname_free(nick);
+      send_auth_reply(nickserv, user, n, 0, "Nickname not found");
+      return pass_callback(ns_on_auth_req_hook, user, n, certfp);
+    }
+    if(nickname_get_id(nick) != nickname_get_id(nick2))
+    {
+      nickname_free(nick);
+      nickname_free(nick2);
+      send_auth_reply(nickserv, user, n, 0, "Nickname not on account");
+      return pass_callback(ns_on_auth_req_hook, user, n, certfp);
+    }
+    else
+    {
+      if(!nickname_cert_check(nick, certfp, NULL))
+        send_auth_reply(nickserv, user, n, 0, "CertFP Mismatch");
+      else
+        send_auth_reply(nickserv, user, n, 1, "Success");
+    
+      nickname_free(nick);
+    }
+
+  }
+  
+  return pass_callback(ns_on_auth_req_hook, user);
+}
+
 static void
 m_status(struct Service *service, struct Client *client, int parc, char *parv[])

trunk/modules/oftc.c

@@ -44 +44 @@
 static void *oftc_sendmsg_svscloak(va_list);
 static void *oftc_sendmsg_svsnick(va_list);
-//static void *oftc_sendmsg_svsjoin(va_list);
+static void *oftc_sendmsg_svsjoin(va_list);
 static void *oftc_identify(va_list);
 static void *oftc_chops_notice(va_list);
 static void *oftc_sendmsg_newuser(va_list);
 static void *oftc_sendmsg_notice(va_list);
+static void *oftc_sendmsg_auth(va_list);
 
 static dlink_node *oftc_gnotice_hook;
@@ -54 +55 @@
 static dlink_node *oftc_svscloak_hook;
 static dlink_node *oftc_svsnick_hook;
-//static dlink_node *oftc_svsjoin_hook;
+static dlink_node *oftc_svsjoin_hook;
 static dlink_node *oftc_identify_hook;
 static dlink_node *oftc_connected_hook;
@@ -60 +61 @@
 static dlink_node *oftc_newuser_hook;
 static dlink_node *oftc_notice_hook;
+static dlink_node *oftc_auth_hook;
 
 static void m_pass(struct Client *, struct Client *, int, char *[]);
@@ -72 +74 @@
 static void m_realhost(struct Client *, struct Client *, int, char *[]);
 static void m_certfp(struct Client *, struct Client *, int, char *[]);
+static void m_auth(struct Client *, struct Client *, int, char *[]);
 
 static struct Message gnotice_msgtab = {
@@ -114 +117 @@
 
 static struct Message svsmode_msgtab = {
-  "SVSMODE", 0, 0, 2, 0, 0, 0, { m_svsmode, m_svsmode }
+  "SVSMODE", 0, 0, 2, 0, 0, 0, 
+  { m_svsmode, m_svsmode }
 };
 
 static struct Message eob_msgtab = {
-  "EOB", 0, 0, 0, 0, 0, 0, { m_eob, m_eob } 
+  "EOB", 0, 0, 0, 0, 0, 0, 
+  { m_eob, m_eob } 
 };
 
 static struct Message realhost_msgtab = {
-  "REALHOST", 0, 0, 3, 0, 0, 0,
+  "REALHOST", 0, 0, 3, 0, 0, 0, 
   { m_realhost, m_realhost }
 };
@@ -129 +134 @@
   "CERTFP", 0, 0, 3, 0, 0, 0,
   { m_certfp, m_certfp }
+};
+
+static struct Message auth_msgtab = {
+  "AUTH", 0, 0, 3, 0, 0, 0,
+  { m_auth, m_auth }
 };
 
@@ -147 +157 @@
 INIT_MODULE(oftc, "$Revision$")
 {
-  oftc_connected_hook  = install_hook(connected_cb, oftc_server_connected);
-  oftc_gnotice_hook   = install_hook(send_gnotice_cb, oftc_sendmsg_gnotice);
-  oftc_umode_hook     = install_hook(send_umode_cb, oftc_sendmsg_svsmode);
-  oftc_svscloak_hook  = install_hook(send_cloak_cb, oftc_sendmsg_svscloak);
-//  oftc_svsjoin_hook   = install_hook(send_nick_cb, oftc_sendmsg_svsjoin);
-  oftc_svsnick_hook   = install_hook(send_nick_cb, oftc_sendmsg_svsnick);
-  oftc_identify_hook  = install_hook(on_identify_cb, oftc_identify);
-  oftc_chops_notice_hook = install_hook(send_chops_notice_cb, oftc_chops_notice);
-  oftc_newuser_hook = install_hook(send_newuser_cb, oftc_sendmsg_newuser);
-  oftc_notice_hook = install_hook(send_notice_cb, oftc_sendmsg_notice);
+  oftc_connected_hook   = install_hook(connected_cb, oftc_server_connected);
+  oftc_gnotice_hook     = install_hook(send_gnotice_cb, oftc_sendmsg_gnotice);
+  oftc_umode_hook       = install_hook(send_umode_cb, oftc_sendmsg_svsmode);
+  oftc_svscloak_hook    = install_hook(send_cloak_cb, oftc_sendmsg_svscloak);
+  oftc_svsjoin_hook     = install_hook(send_autojoin_cb, oftc_sendmsg_svsjoin);
+  oftc_svsnick_hook     = install_hook(send_nick_cb, oftc_sendmsg_svsnick);
+  oftc_identify_hook    = install_hook(on_identify_cb, oftc_identify);
+  oftc_chops_notice_hook= install_hook(send_chops_notice_cb, oftc_chops_notice);
+  oftc_newuser_hook     = install_hook(send_newuser_cb, oftc_sendmsg_newuser);
+  oftc_notice_hook      = install_hook(send_notice_cb, oftc_sendmsg_notice);
+  oftc_auth_hook        = install_hook(send_auth_cb, oftc_sendmsg_auth);
   mod_add_cmd(&gnotice_msgtab);
   mod_add_cmd(&pass_msgtab);
@@ -169 +180 @@
   mod_add_cmd(&realhost_msgtab);
   mod_add_cmd(&certfp_msgtab);
+  mod_add_cmd(&auth_msgtab);
+
   return ModeList;
 }
@@ -186 +199 @@
   mod_del_cmd(&realhost_msgtab);
   mod_del_cmd(&certfp_msgtab);
+  mod_del_cmd(&auth_msgtab);
 
   uninstall_hook(send_gnotice_cb, oftc_sendmsg_gnotice);
@@ -194 +208 @@
   uninstall_hook(send_newuser_cb, oftc_sendmsg_newuser);
   uninstall_hook(send_notice_cb, oftc_sendmsg_notice);
+  uninstall_hook(send_auth_cb, oftc_sendmsg_auth);
+  uninstall_hook(send_autojoin_cb, oftc_sendmsg_svsjoin);
 }
 
@@ -290 +306 @@
   strlcpy(target->certfp, parv[2], sizeof(target->certfp));
   execute_callback(on_certfp_cb, target);
+}
+
+static void
+m_auth(struct Client *client, struct Client *source, int parc, char *parv[])
+{
+  ilog(L_DEBUG, "AUTH request for %s[%s] certfp %s from %s", parv[1], 
+      parv[2], parv[3], parv[0]);
+
+  execute_callback(on_auth_request_cb, parv[1], parv[2], parv[3]);
 }
 
@@ -663 +688 @@
 
 static void *
+oftc_sendmsg_svsjoin(va_list args)
+{
+  struct Client *uplink = va_arg(args, struct Client *);
+  struct Client *user = va_arg(args, struct Client *);
+  char *channel = va_arg(args, char *);
+
+  if(!HasID(user))
+    sendto_server(uplink, ":%s SVSJOIN %s :%s", me.name, user->name, channel);
+  else
+    sendto_server(uplink, ":%s SVSJOIN %s :%s", me.name, user->id, channel);
+
+  return pass_callback(oftc_svsjoin_hook, uplink, user, channel);
+}
+
+static void *
 oftc_chops_notice(va_list args)
 {
@@ -750 +790 @@
   return NULL;
 }
+
+static void*
+oftc_sendmsg_auth(va_list args)
+{
+  struct Client *client = va_arg(args, struct Client *);
+  char          *user   = va_arg(args, char *);
+  char          *nick   = va_arg(args, char *);
+  int           ret     = va_arg(args, int);
+  char          *reason = va_arg(args, char *);
+
+  sendto_server(client, ":%s AUTH %s %s %d :%s", me.id, user, nick, ret, reason);
+
+  return NULL;
+}

trunk/src/interface.c

@@ -71 +71 @@
 struct Callback *send_chops_notice_cb;
 struct Callback *send_squit_cb;
+struct Callback *send_autojoin_cb;
+struct Callback *send_auth_cb;
 
 static BlockHeap *services_heap  = NULL;
@@ -91 +93 @@
 struct Callback *on_certfp_cb;
 struct Callback *on_db_init_cb;
+struct Callback *on_auth_request_cb;
 
 struct Callback *on_nick_reg_cb;
@@ -133 +136 @@
   send_chops_notice_cb = register_callback("Send NOTICE to channel ops", NULL);
   send_squit_cb       = register_callback("Send SQUIT Message", NULL);
+  send_autojoin_cb    = register_callback("Auto join a user to a channel", NULL);
+  send_auth_cb        = register_callback("Send an AUTH response", NULL);
   on_nick_change_cb   = register_callback("Propagate NICK", NULL);
   on_join_cb          = register_callback("Propagate JOIN", NULL);
@@ -158 +163 @@
   on_chan_reg_cb      = register_callback("Newly Registered Chan", NULL);
   on_group_reg_cb     = register_callback("Newly Registered Group", NULL);
+  on_auth_request_cb  = register_callback("Authetication requested", NULL);
   do_event_cb         = register_callback("Event Loop Callback", NULL);
 
@@ -182 +188 @@
   unregister_callback(send_kill_cb);
   unregister_callback(send_resv_cb);
+  unregister_callback(send_topic_cb);
+  unregister_callback(send_kill_cb);
+  unregister_callback(send_resv_cb);
   unregister_callback(send_unresv_cb);
   unregister_callback(send_newserver_cb);
@@ -189 +198 @@
   unregister_callback(send_chops_notice_cb);
   unregister_callback(send_squit_cb);
+  unregister_callback(send_autojoin_cb);
+  unregister_callback(send_auth_cb);
   unregister_callback(on_nick_change_cb);
   unregister_callback(on_join_cb);
@@ -211 +222 @@
   unregister_callback(on_chan_reg_cb);
   unregister_callback(on_group_reg_cb);
+  unregister_callback(on_auth_request_cb);
   unregister_callback(do_event_cb);
 
@@ -370 +382 @@
 {
   execute_callback(send_privmsg_cb, me.uplink, service->name, channel->chname, text);
+}
+
+void
+send_auth_reply(struct Service *service, char *user, char *nick, int response, char *reason)
+{
+  execute_callback(send_auth_cb, me.uplink, user, nick, response, reason);
+  
+  ilog(L_DEBUG, "Sending auth reply %s %s %d %s", user, nick, response, reason);
 }