Commit changes to allow a default server and to improve peering config.

[trust_router.git] / tr / tr_main.c

diff --git a/tr/tr_main.c b/tr/tr_main.c
index c71d724..9de6ad0 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -37,7 +37,7 @@
 
 #include <tr.h>
 #include <tr_filter.h>
-#include <trust_router/tid.h>
+#include <tid_internal.h>
 #include <tr_config.h>
 #include <tr_comm.h>
 #include <tr_idp.h>
@@ -68,7 +68,7 @@ static void tr_tidc_resp_handler (TIDC_INSTANCE *tidc,
 
 static int tr_tids_req_handler (TIDS_INSTANCE *tids,
                      TID_REQ *orig_req, 
-                     TID_RESP **resp,
+                     TID_RESP *resp,
                      void *tr)
 {
   TIDC_INSTANCE *tidc = NULL;
@@ -78,9 +78,10 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
   TID_REQ *fwd_req = NULL;
   TR_COMM *cfg_comm = NULL;
   TR_COMM *cfg_apc = NULL;
-  int rc;
+  int oaction = TR_FILTER_ACTION_REJECT;
+  int rc = 0;
 
-  if ((!tids) || (!orig_req) || (!resp) || (!(*resp)) || (!tr)) {
+  if ((!tids) || (!orig_req) || (!resp) ||  (!tr)) {
     fprintf(stderr, "tids_req_handler: Bad parameters\n");
     return -1;
   }
@@ -106,18 +107,18 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
    * was received. */
 
   if ((!((TR_INSTANCE *)tr)->rp_gss) || 
-      (!((TR_INSTANCE *)tr)->rp_gss->rp_match)) {
+      (!((TR_INSTANCE *)tr)->rp_gss->filter)) {
     fprintf(stderr, "tr_tids_req_handler: No GSS name for incoming request.\n");
     tids_send_err_response(tids, orig_req, "No GSS name for request");
     return -1;
   }
 
-  if (!tr_prefix_wildcard_match(orig_req->rp_realm->buf, ((TR_INSTANCE *)tr)->rp_gss->rp_match->buf)) { 
-    fprintf(stderr, "tr_tids_req_handler: RP realm (%s) does not match RP Realm filter for GSS name (%s)\n", orig_req->rp_realm->buf, ((TR_INSTANCE *)tr)->rp_gss->rp_match->buf);
+  if ((TR_FILTER_NO_MATCH == tr_filter_process_rp_permitted(orig_req->rp_realm, ((TR_INSTANCE *)tr)->rp_gss->filter, orig_req->cons, &fwd_req->cons, &oaction)) ||
+      (TR_FILTER_ACTION_REJECT == oaction)) {
+    fprintf(stderr, "tr_tids_req_handler: RP realm (%s) does not match RP Realm filter for GSS name\n", orig_req->rp_realm->buf);
     tids_send_err_response(tids, orig_req, "RP Realm filter error");
     return -1;
   }
-
   /* Check that the rp_realm and target_realm are members of the community in the request */
   if (NULL == (tr_find_comm_rp(cfg_comm, orig_req->rp_realm))) {
     fprintf(stderr, "tr_tids_req_hander: RP Realm (%s) not member of community (%s).\n", orig_req->rp_realm->buf, orig_req->comm->buf);
@@ -168,10 +169,15 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
   if (NULL == (aaa_servers = tr_idp_aaa_server_lookup((TR_INSTANCE *)tids->cookie, 
                                                      orig_req->realm, 
                                                      orig_req->comm))) {
-      fprintf(stderr, "tr_tids_req_handler: No AAA Servers for realm %s.\n", orig_req->realm->buf);
+      fprintf(stderr, "tr_tids_req_handler: No AAA Servers for realm %s, defaulting.\n", orig_req->realm->buf);
+      if (NULL == (aaa_servers = tr_default_server_lookup ((TR_INSTANCE *)tids->cookie,
+                                                          orig_req->comm))) {
+       fprintf(stderr, "tr_tids_req_handler: No default AAA servers, discarded.\n");
       tids_send_err_response(tids, orig_req, "No path to AAA Server(s) for realm");
       return -1;
-    }
+      }
+  }
+
   /* send a TID request to the AAA server(s), and get the answer(s) */
   /* TBD -- Handle multiple servers */
 
@@ -191,9 +197,9 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
   resp_cookie.orig_req = orig_req;
 
   /* Set-up TID connection */
-  /* TBD -- handle IPv6 Addresses */
   if (-1 == (fwd_req->conn = tidc_open_connection(tidc, 
-                                             inet_ntoa(aaa_servers->aaa_server_addr), 
+                                                 aaa_servers->hostname->buf,
+                                                 TID_PORT,
                                              &(fwd_req->gssctx)))) {
     fprintf(stderr, "tr_tids_req_handler: Error in tidc_open_connection.\n");
     tids_send_err_response(tids, orig_req, "Can't open connection to next hop TIDS");
@@ -229,6 +235,7 @@ static int tr_tids_gss_handler(gss_name_t client_name, TR_NAME *gss_name,
   /* Store the rp client in the TR_INSTANCE structure for now... 
    * TBD -- fix me for new tasking model. */
   ((TR_INSTANCE *)tr)->rp_gss = rp;
+  fprintf( stderr, "Client's GSS Name: %s\n", gss_name->buf);
   return 0;
 }
 
@@ -255,12 +262,7 @@ int main (int argc, const char *argv[])
     exit(1);
   }
 
-  /* read and parse initial configuration */
-  if (NULL == (jcfg = tr_read_config (n, cfg_files))) {
-    fprintf (stderr, "Error reading or parsing configuration files, exiting.\n");
-    exit(1);
-  }
-  if (TR_CFG_SUCCESS != tr_parse_config(tr, jcfg)) {
+  if (TR_CFG_SUCCESS != tr_parse_config(tr, cfg_files)) {
     fprintf (stderr, "Error decoding configuration information, exiting.\n");
     exit(1);
   }
@@ -278,7 +280,7 @@ int main (int argc, const char *argv[])
   }
 
   /* start the trust path query server, won't return unless fatal error. */
-  if (0 != (err = tids_start(tr->tids, &tr_tids_req_handler, &tr_tids_gss_handler, (void *)tr))) {
+  if (0 != (err = tids_start(tr->tids, &tr_tids_req_handler, &tr_tids_gss_handler, tr->active_cfg->internal->hostname, tr->active_cfg->internal->tids_port, (void *)tr))) {
     fprintf (stderr, "Error from Trust Path Query Server, err = %d.\n", err);
     exit(err);
   }