1. separate access checking from setup routines

2. check max argument length

diff --git a/server/qrtn.qc b/server/qrtn.qc
index 10f1407994679d5e19428b121ae4ed48f02c4634..2a5fe26033c2dade49f66a8f9386882ef1548bde 100644 (file)
--- a/server/qrtn.qc
+++ b/server/qrtn.qc
@@ -6,9 +6,17 @@
  *     Copyright (C) 1987 by the Massachusetts Institute of Technology
  *
  *     $Log$
- *     Revision 1.13  1988-01-04 12:02:13  mar
- *     moved transaction start before pre-routines (wesommer)
+ *     Revision 1.14  1988-01-14 13:37:57  mar
+ *     1. separate access checking from setup routines
+ *     2. check max argument length
  *
+ * Revision 1.14  88/01/14  13:14:37  mar
+ * 1. separate access checking from setup routines
+ * 2. check max argument length
+ * 
+ * Revision 1.13  88/01/04  12:02:13  mar
+ * moved transaction start before pre-routines (wesommer)
+ * 
  * Revision 1.13  87/11/12  18:13:12  wesommer
  * Move transaction boundary to include the pre routine.
  * 
@@ -84,7 +92,7 @@ int sms_open_database()
 
     /* initialize local argv */
     for (i = 0; i < 16; i++)
-       Argv[i] = (char *)malloc(128);
+       Argv[i] = (char *)malloc(ARGLEN);
 
     IIseterr(ingerr);
        
@@ -106,52 +114,14 @@ sms_check_access(cl, name, argc, argv_ro)
     int argc;
     char *argv_ro[];
 {
-    register struct query *q;
-    register int argreq;
-    register int status;
-    register struct validate *v;
-    register int i;
-    register int privileged;
+    struct query *q;
     struct query *get_query_by_name();
-    int access_user();
-    int access_pop();
-    int access_list();
 
     q = get_query_by_name(name);
-    if (q == (struct query *)0) return(SMS_NO_HANDLE);
-    v = q->validate;
-
-    /* copy the arguments into a local argv that we can modify */
-    for (i = 0; i < argc; i++)
-       strcpy(Argv[i], argv_ro[i]);
-
-    /* check initial query access */
-    status = check_query_access(q, Argv, cl);
-    privileged = (status == SMS_SUCCESS) ? 1 : 0;
-    if (status != SMS_SUCCESS && !(v && (v->pre_rtn == access_user ||
-                                        v->pre_rtn == access_pop ||
-                                        v->pre_rtn == access_list))) 
-       return(status);
-
-    /* check argument count */
-    argreq = q->argc;
-    if (q->type == UPDATE || q->type == APPEND) argreq += q->vcnt;
-    if (argc != argreq) return(SMS_ARGS);
-
-    /* validate arguments */
-    if (v && v->valobj) {
-       status = validate_fields(q, Argv, v->valobj, v->objcnt);
-       if (status != SMS_SUCCESS) return(status);
-    }
+    if (q == (struct query *)0)
+       return(SMS_NO_HANDLE);
 
-    /* perform special query access check */
-    if (v && v->pre_rtn) {
-       status = (*v->pre_rtn)(q, Argv, cl, 1);
-       if (status != SMS_SUCCESS && (status != SMS_PERM || !privileged)) 
-           return(status);
-    }
-
-    return(SMS_SUCCESS);
+    return(sms_verify_query(cl, q, argc, argv_ro));
 }
 
 sms_process_query(cl, name, argc, argv_ro, action, actarg)
@@ -163,11 +133,8 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     char *actarg;
 {
     register struct query *q;
-    register int i;
     register int status;
-    register int argreq;
     register struct validate *v;
-    int privileged;
     char qual[256];
     char sort[32];
     char *pqual;
@@ -178,13 +145,6 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     int sq_save_args();
     struct save_queue *sq_create();
     char *build_sort();
-    int access_user();
-    int access_pop();
-    int access_list();
-
-    /* copy the arguments into a local argv that we can modify */
-    for (i = 0; i < argc; i++)
-       strcpy(Argv[i], argv_ro[i]);
 
     /* list queries command */
     if (!strcmp(name, "_list_queries")) {
@@ -194,7 +154,7 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
 
     /* help query command */
     if (!strcmp(name, "_help")) {
-       q = get_query_by_name(Argv[0]);
+       q = get_query_by_name(argv_ro[0]);
        if (q == (struct query *)0) return(SMS_NO_HANDLE);
        help_query(q, action, actarg);
        return(SMS_SUCCESS);
@@ -208,34 +168,14 @@ sms_process_query(cl, name, argc, argv_ro, action, actarg)
     if (q->type != RETRIEVE)
 ##      begin transaction
 
-       /* check query access */
-    status = check_query_access(q, Argv, cl);
-    privileged = (status == SMS_SUCCESS) ? 1 : 0;
-    if (!privileged && !(status == SMS_PERM &&
-                        (v && (v->pre_rtn == access_user ||
-                               v->pre_rtn == access_pop ||
-                               v->pre_rtn == access_list))))
+    /* setup argument vector, verify access and arguments */
+    if ((status = sms_verify_query(cl, q, argc, argv_ro)) != SMS_SUCCESS)
        goto out;
 
-    /* check argument count */
-    argreq = q->argc;
-    if (q->type == UPDATE || q->type == APPEND) argreq += q->vcnt;
-    if (argc != argreq) {
-       status = SMS_ARGS;
-       goto out;
-    }
-       
-
-    /* validate arguments */
-    if (v && v->valobj) {
-       status = validate_fields(q, Argv, v->valobj, v->objcnt);
-       if (status != SMS_SUCCESS) goto out;
-    }
-
     /* perform any special query pre-processing */
     if (v && v->pre_rtn) {
        status = (*v->pre_rtn)(q, Argv, cl, 0);
-       if (status != SMS_SUCCESS && (status != SMS_PERM || !privileged))
+       if (status != SMS_SUCCESS)
            goto out;
     }
 
@@ -458,6 +398,59 @@ build_sort(v, sort)
     return ((*sort) ? sort : 0);
 }
 
+
+/* Build arguement vector, verify query and arguments */
+
+sms_verify_query(cl, q, argc, argv_ro)
+    client *cl;
+    struct query *q;
+    int argc;
+    char *argv_ro[];
+{
+    register int argreq;
+    register int status;
+    register struct validate *v = q->validate;
+    register int i;
+    register int privileged = 0;
+
+    /* copy the arguments into a local argv that we can modify */
+    for (i = 0; i < argc; i++) {
+       if (strlen(argv_ro[i]) < ARGLEN)
+           strcpy(Argv[i], argv_ro[i]);
+       else
+           return(SMS_ARG_TOO_LONG);
+    }
+
+    /* check initial query access */
+    status = check_query_access(q, Argv, cl);
+    if (status != SMS_SUCCESS && status != SMS_PERM)
+       return(status);
+    if (status == SMS_SUCCESS)
+       privileged++;
+
+    /* check argument count */
+    argreq = q->argc;
+    if (q->type == UPDATE || q->type == APPEND) argreq += q->vcnt;
+    if (argc != argreq) return(SMS_ARGS);
+
+    /* validate arguments */
+    if (v && v->valobj) {
+       status = validate_fields(q, Argv, v->valobj, v->objcnt);
+       if (status != SMS_SUCCESS) return(status);
+    }
+
+    /* perform special query access check */
+    if (!privileged && v && v->acs_rtn) {
+       status = (*v->acs_rtn)(q, Argv, cl);
+       if (status != SMS_SUCCESS && status != SMS_PERM)
+           return(status);
+       if (status == SMS_SUCCESS)
+           privileged++;
+    }
+
+    return(privileged ? SMS_SUCCESS : SMS_PERM);
+}
+
 check_query_access(q, argv, cl)
     struct query *q;
     char *argv[];