/* common stuff for cgi-fcgi-interp and prefork-interp */
+/*
+ * Copyright 2016-2022 Ian Jackson and contributors to chiark-utils
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * There is NO WARRANTY.
+ */
#include "prefork.h"
const char *interp, *ident, *script, *socket_path, *lock_path;
bool logging;
struct sha256_ctx identsc;
+const char *run_base;
static uid_t us;
-static const char *run_base;
static const char *run_base_mkdir_p;
void common_diee(const char *m) { diee("%s", m); }
*ci->iassignto = v;
}
-void ident_addstring(const struct cmdinfo *ci, const char *string) {
- /* ci may be 0 and is provided so this can be .call */
+void ident_add_key_byte(char key) {
+ sha256_update(&identsc,1,&key);
+}
+
+void ident_addstring(char key, const char *string) {
+ ident_add_key_byte(key);
sha256_update(&identsc,strlen(string)+1,string);
}
+void off_ident_addstring(const struct cmdinfo *ci, const char *string) {
+ ident_addstring('G', string);
+}
+
void off_ident_addenv(const struct cmdinfo *ci, const char *name) {
+ ident_addstring('E', name);
const char *val = getenv(name);
if (val) {
- sha256_update(&identsc,strlen(name),name); /* no nul */
- sha256_update(&identsc,1,"=");
- ident_addstring(0,val);
+ ident_addstring('v', val);
} else {
- ident_addstring(0,name);
+ ident_add_key_byte(0);
}
}
unsigned char bbuf[32];
int i;
- ident_addstring(0,interp);
+ ident_addstring('i', interp);
if (script)
- ident_addstring(0,script);
+ ident_addstring('s', script);
sha256_digest(&identsc,sizeof(bbuf),bbuf);
for (i=0; i<identlen; i += 2)