Fix gss matching code to compare to the rp realm for the request.

diff --git a/include/tr.h b/include/tr.h
index 8ca9c37..5c01c4a 100644 (file)
--- a/include/tr.h
+++ b/include/tr.h
@@ -38,13 +38,15 @@
 #include <trust_router/tid.h>
 #include <trust_router/tr_name.h>
 #include <tr_msg.h>
+#include <tr_rp.h>
 
 #define TRUST_ROUTER_PORT      12308
 
 typedef struct tr_instance {
-  struct tr_cfg *new_cfg;      /* unapplyed configuration */
+  struct tr_cfg *new_cfg;      /* unapplied configuration */
   struct tr_cfg *active_cfg;
   TIDS_INSTANCE *tids;
+  struct tr_rp_client *rp_gss;         /* Client matching GSS name, TBD -- FIX ME */
 } TR_INSTANCE;
 
 TR_INSTANCE *tr_create(void);

diff --git a/include/tr_rp.h b/include/tr_rp.h
index 79a2fbf..d022cca 100644 (file)
--- a/include/tr_rp.h
+++ b/include/tr_rp.h
@@ -35,9 +35,11 @@
 #ifndef TR_RP_H
 #define TR_RP_H
 
+#include <tr.h>
+
 #define TR_MAX_GSS_NAMES 5
 
-#include <tr.h>
+typedef struct tr_instance TR_INSTANCE;
 
 typedef struct tr_rp_client {
   struct tr_rp_client *next;

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 6c6fb23..0e659df 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -66,7 +66,7 @@ static void tr_tidc_resp_handler (TIDC_INSTANCE *tidc,
   return;
 }
 
-static int tr_tids_req_handler (TIDS_INSTANCE * tids,
+static int tr_tids_req_handler (TIDS_INSTANCE *tids,
                      TID_REQ *orig_req, 
                      TID_RESP **resp,
                      void *tr)
@@ -80,7 +80,7 @@ static int tr_tids_req_handler (TIDS_INSTANCE * tids,
   TR_COMM *cfg_apc = NULL;
   int rc;
 
-  if ((!tids) || (!orig_req) || (!resp) || (!(*resp))) {
+  if ((!tids) || (!orig_req) || (!resp) || (!(*resp)) || (!tr)) {
     fprintf(stderr, "tids_req_handler: Bad parameters\n");
     return -1;
   }
@@ -102,6 +102,23 @@ static int tr_tids_req_handler (TIDS_INSTANCE * tids,
     return -1;
   }
 
+  /* Check that the rp_realm matches the filter for the GSS name that 
+   * was received. */
+
+  if ((!((TR_INSTANCE *)tr)->rp_gss) || 
+      (!((TR_INSTANCE *)tr)->rp_gss->rp_match)) {
+    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(((TR_INSTANCE *)tr)->rp_gss->rp_match->buf, 
+                               orig_req->rp_realm->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);
+    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);
@@ -198,7 +215,6 @@ static int tr_tids_gss_handler(gss_name_t client_name, TR_NAME *gss_name,
                        void *tr)
 {
   TR_RP_CLIENT *rp;
-  int i = 0;
 
   if ((!client_name) || (!gss_name) || (!tr)) {
     fprintf(stderr, "tr_tidc_gss_handler: Bad parameters.\n");
@@ -211,13 +227,9 @@ static int tr_tids_gss_handler(gss_name_t client_name, TR_NAME *gss_name,
     return -1;
   }
 
-  /* check if the gss name matches the filter in the rp realm */
-  if (!(i = tr_prefix_wildcard_match(gss_name->buf, rp->rp_match->buf))) {
-    fprintf(stderr, "tr_tids_gss_handler: RP realm does not match, realm %s, math %s\n", gss_name->buf, rp->rp_match->buf);
-    return -1;
-  }
-
-  /* Otherwise, all is well... */
+  /* Store the rp client in the TR_INSTANCE structure for now... 
+   * TBD -- fix me for new tasking model. */
+  ((TR_INSTANCE *)tr)->rp_gss = rp;
   return 0;
 }