Changeset 231

Timestamp:

05/20/05 02:29:47 (4 years ago)

Author:

athomas

Message:

• Fixed use of DEFAULT section, closes #5. Quite a pain in the arse actually.
  
• Environment variables can now be propagated into child environments even when "environment" is specified. This will override any existing variables.
  
• Now using vsnprintf rather than snprintf. Correspondingly, changed preprocessor define which may mean build scripts need to be changed.
  

Files:

• op/trunk/ChangeLog (modified) (1 diff)
• op/trunk/defs.h (modified) (3 diffs)
• op/trunk/lex.l (modified) (7 diffs)
• op/trunk/main.c (modified) (12 diffs)
• op/trunk/Makefile (modified) (2 diffs)
• op/trunk/op.1 (modified) (4 diffs)
• op/trunk/README (modified) (1 diff)
• op/trunk/.todo (modified) (2 diffs)
• op/trunk/util.c (modified) (1 diff)

op/trunk/ChangeLog

@@ -150 +150 @@
-
-Closes #4
+
+20/05/05 - op 1.30
+==================
+Fixed use of DEFAULT section, closes #5. Quite a pain in the arse actually.
+
+Environment variables can now be propagated into child environments even when
+"environment" is specified. This will override any existing variables.
+
+Now using vsnprintf rather than snprintf. Correspondingly, changed preprocessor
+define which may mean build scripts need to be changed.

op/trunk/defs.h

@@ -39 +39 @@
-int array_extend(array_t *array, int capacity);
-
-
+, *BuildSingle()
-extern var_t    *Variables;
-extern unsigned minimum_logging_level;
@@ -45 +45 @@
-void fatal(int logit, const char *format, ...);
-int logger(unsigned flags, const char *format, ...);
+void strnprintf(char *out, int len, const char *format, ...);
+char *strtolower(char *in);
-
-int ReadFile(char *file);
@@ -54 +56 @@
-#define OP_ACCESS       "/etc/op.conf"
-#define OP_ACCESS_DIR   "/etc/op.d"
-29
+30
-
-#define VAR_EXPAND_LEN  8192

op/trunk/lex.l

@@ -244 +244 @@
-}
-
-
-
+
-{
-        cmd_t   *cmd = (cmd_t *)malloc(sizeof(cmd_t));
@@ -251 +250 @@
-        if (cmd == NULL)
-                fatal(1, "Unable to alloc space for new command");
-
-        cmd->next = First;
-        First = cmd;
-
-        cmd->name = savestr(name);
@@ -265 +261 @@
-
-        return cmd;
+}
+
+static cmd_t    *newcmd(char *name)
+{
+        cmd_t   *cmd = alloccmd(name);
+
+        cmd->next = First;
+        First = cmd;
+
+        return cmd;
+
-}
-
@@ -380 +387 @@
-}
-
-
-def, *cmd;
-
-       *new = newcmd(
-       
+
+BuildSingle(cmd_t *def, cmd_t *cmd)
+
+*new = alloccmd(cmd->name ? cmd->name : 
+
-        int             i, j;
-#ifndef _AIX
@@ -398 +405 @@
-
-        for (i = 0; i < def->nopts; i++) {
+        int skipped = 0;
+
-                if ((cp = strchr(def->opts[i], '=')) == NULL)
-                        strcpy(defname, def->opts[i]);
@@ -413 +422 @@
-                                optname[l] = '\0';
-                        }
-
-
+
+
+
+
-                }
+                if (skipped) continue;
-                if (def->opts[i][0] != '\0')
-                        addarg(1, new, def->opts[i]);
@@ -426 +438 @@
-        return new;
-}
+
+
+/* Build a new command *and* merge it with the global command list */
+cmd_t   *Build(cmd_t *def, cmd_t *cmd)
+{
+        cmd_t *new =    BuildSingle(def, cmd);
+
+        new->next = First;
+        First = new;
+
+        return new;
+}

op/trunk/main.c

@@ -107 +107 @@
-void ListCommands()
-{
-
+def, *
-array_t *cmds = array_alloc();
-int length = 0, i;
-
+        def = Find("DEFAULT");
-        /*      first pass, get maximum command length and number of commands we have
-                permission to use */
-        for (cmd = First; cmd != NULL; cmd = cmd->next) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
@@ -133 +139 @@
-                cmd = cmds->data[i];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
@@ -174 +182 @@
-                for (i = 0; i < dir_list->size; ++i) {
-                char full_path[PATH_MAX];
-
-
-
-
-
+
-                        if (ReadFile(full_path)) successes++;
-                }
@@ -299 +303 @@
-
-        new = Build(def, cmd);
+
-        num = CountArgs(new);
-
@@ -321 +326 @@
-
-        for (cmd = First; cmd != NULL; cmd = cmd ->next) {
- && VerifyPermissions(cmd) >= 0
+
-                        break;
-        }
@@ -449 +454 @@
-regexp          *reg1 = NULL;
-struct passwd   *pw;
-#ifdef USE_PAM
-struct pam_conv pamconv = { pam_conversation, NULL };
-pam_handle_t *pam;
-#endif
-struct group    *gr;
-
@@ -950 +951 @@
-                        if (cmd->opts[i][0] != '$')
-                                continue;
+                        /* Skip positional constraints */
-                        cp = cmd->opts[i] + 1;
-                        flag = 0;
@@ -957 +959 @@
-                                cp++;
-                        }
- 
+
-                                continue;
-
-
-
-
-
-
+
-                        for (j = 0; environ[j] != NULL ; j++) {
-                                if ((cp = strchr(environ[j], '=')) == NULL)
-                                        continue;
-
-
+
-                                        if (curenv + 1 >= MAXENV)
-                                                fatal(1, "Environment length exceeded");
@@ -982 +978 @@
-                                fatal(1, "Environment length exceeded");
-                        new_envp[curenv++] = environ[i];
+                }
+        }
+        /* Allow over-ride of environment variables. */
+        for (i = 0; i < cmd->nopts; ++i) {
+                /* Skip positional constraints */
+                cp = cmd->opts[i] + 1;
+                flag = 0;
+                while ((*cp != '\0') && (*cp != '=')) {
+                        if (! isdigit(*cp))
+                                flag = 1;
+                        cp++;
+                }
+                if (!flag)
+                        continue;
+                if (cmd->opts[i][0] == '$' && strchr(cmd->opts[i], '=') != NULL) {
+                        if (curenv + 1 >= MAXENV)
+                                fatal(1, "Environment length exceeded");
+                        new_envp[curenv++] = cmd->opts[i] + 1;
+                        continue;
-                }
-        }
@@ -1171 +1186 @@
-}
-
-#ifndef HAVE_SNPRINTF
-#warning You have not compiled op with snprintf support, presumably because
-#warning your system does not have it. This leaves op potentially open to
-#warning buffer overflows.
-#endif
-
-unsigned minimum_logging_level = 99;
-
@@ -1187 +1196 @@
-        if (realuser) username = realuser->pw_name;
-
-
-
-
-
-
+
-        if (level & LOG_PRINT) printf("%s\n", buffer2);
-        level &= ~LOG_PRINT;
-
-
+
-                format_cmd(gargc, gargv, buffer3, MAXSTRLEN),
-                buffer2);
-#else
-        sprintf(buffer, "%s =>%s: %s", username, 
-                format_cmd(gargc, gargv, buffer3, MAXSTRLEN),
-                buffer2);
-#endif
-        syslog(level, "%s", buffer);
-        return -1;
@@ -1221 +1220 @@
-
-        va_start(ap, format);
-
-
-
-
-
+
-        fprintf(stderr, "%s\n", buffer);
-        if (logit) logger(LOG_ERR, "%s", buffer);

op/trunk/Makefile

@@ -4 +4 @@
-CC=gcc
-INC= -I. -Wall
-
+f
-DESTDIR=
-PREFIX=/usr
@@ -27 +27 @@
-
-# Enable PAM support
-#
-#
+
+
-
-# Enable shadow support (generally not used in conjunction with PAM)
-
+#
-
-# Enable XAUTH support
-OPTS += -DXAUTH=\"/usr/X11R6/bin/xauth\"
-
-snprintf(3
-
+vsnprintf(3) (more secure
+V
-
-############################ LEGACY CONFIG ####################################

op/trunk/op.1

@@ -167 +167 @@
-.B $USER)
-means that this environment variable is inherited unchanged from
-
+
+
-.TP
-.B environment
@@ -297 +298 @@
-.br
-        password
+.br
+    help="Root shell"
-.PP
-.br
@@ -308 +311 @@
-.br
-        password
+.br
+    help="Reboot system"
-.PP
-# 'op shutdown <time>' - shutdown at a 
@@ -322 +327 @@
-.br
-    $1=(now|[0-1]?[0-9]:[0-9][0-9]|2[0-3]:[0-5][0-9]|\+[0-9]+)
+.br
+    help="Shutdown system"
-.PP
-# Switch inetd on and off, shows complex

op/trunk/README

@@ -79 +79 @@
-        Howard Owen. (hbo@egbok.com)
-
-
+
+
-

op/trunk/.todo

@@ -1 @@
-14/04/05, 23:43
+20/05/05, 12:57
-<todo version="0.1.18">
-    <note priority="medium" time="1031933086" done="1049945562">
@@ -28 +28 @@
-        Make a "nolog" option to prevent logging - for automated commands.
-    </note>
-
+ done="1116557866"
-        Fix bug where $VARS aren't being expanded correctly inside quotes. This is occurring in main.c.
-    </note>

op/trunk/util.c

@@ +1 @@
+#include <stdio.h>
+#include <ctype.h>
+#include <stdarg.h>
-#include <stdlib.h>
-#include "defs.h"
+
+#ifndef HAVE_VSNPRINTF
+#warning You have not compiled op with vsnprintf
+#warning support, presumably because your system
+#warning does not have it. This leaves op open
+#warning to potential buffer overflows.
+#endif
+
+#ifdef HAVE_SNPRINTF
+#error "Now using 'vsnprintf' instead of snprintf. Adjust your build to define HAVE_VSNPRINTF."
+#endif
+
+void strnprintf(char *out, int len, const char *format, ...) {
+va_list args;
+
+        va_start(args, format);
+#ifdef HAVE_VSNPRINTF
+        vsnprintf(out, len, format, args);
+#else
+        vsprintf(out, format, args);
+#endif
+        va_end(args);
+}
+
+char *strtolower(char *in) {
+char *i;
+
+        for (i = in; *i; ++i) *i = tolower(*i);
+        return in;
+}
-
-array_t *array_alloc() {