chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call it beta.
[userv.git]
/
process.c
diff --git
a/process.c
b/process.c
index 98bbeec6523bd73ffc966057b2f3e296e1a5dab8..64afd5c419aba03a85e2e29c6b0b2123fc78c1e0 100644
(file)
--- a/
process.c
+++ b/
process.c
@@
-2,7
+2,7
@@
* userv - process.c
* daemon code to process one request (is parent of service process)
*
* userv - process.c
* daemon code to process one request (is parent of service process)
*
- * Copyright (C)1996-199
7
Ian Jackson
+ * Copyright (C)1996-199
9
Ian Jackson
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
@@
-52,7
+52,8
@@
#include <ctype.h>
#include <limits.h>
#include <sys/wait.h>
#include <ctype.h>
#include <limits.h>
#include <sys/wait.h>
-#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@
-60,6
+61,7
@@
#include "config.h"
#include "common.h"
#include "config.h"
#include "common.h"
+#include "both.h"
#include "daemon.h"
#include "lib.h"
#include "tokens.h"
#include "daemon.h"
#include "lib.h"
#include "tokens.h"
@@
-73,7
+75,7
@@
int fdarraysize, fdarrayused;
int restfdwantstate= tokv_word_rejectfd, restfdwantrw;
int service_ngids;
char **argarray;
int restfdwantstate= tokv_word_rejectfd, restfdwantrw;
int service_ngids;
char **argarray;
-char *serviceuser, *service, *logname, *cwd;
+char *serviceuser, *service, *log
in
name, *cwd;
char *overridedata, *userrcfile;
char *serviceuser_dir, *serviceuser_shell, *callinguser_shell;
gid_t *calling_gids, *service_gids;
char *overridedata, *userrcfile;
char *serviceuser_dir, *serviceuser_shell, *callinguser_shell;
gid_t *calling_gids, *service_gids;
@@
-126,7
+128,7
@@
static void xfwriteerror(void) {
if (errno != EPIPE) syscallerror("writing to client");
blocksignals();
ensurelogopen(USERVD_LOGFACILITY);
if (errno != EPIPE) syscallerror("writing to client");
blocksignals();
ensurelogopen(USERVD_LOGFACILITY);
- syslog(LOG_
DEBUG
,"client went away (broken pipe)");
+ syslog(LOG_
INFO
,"client went away (broken pipe)");
disconnect(8);
}
disconnect(8);
}
@@
-147,11
+149,11
@@
static void xfflush(FILE *file) {
static void xfread(void *p, size_t sz) {
size_t nr;
static void xfread(void *p, size_t sz) {
size_t nr;
- nr=
fread(p,1
,sz,srfile); if (nr == sz) return;
+ nr=
working_fread(p
,sz,srfile); if (nr == sz) return;
if (ferror(srfile)) syscallerror("reading from client");
blocksignals();
assert(feof(srfile));
if (ferror(srfile)) syscallerror("reading from client");
blocksignals();
assert(feof(srfile));
- syslog(LOG_
DEBUG
,"client went away (unexpected EOF)");
+ syslog(LOG_
INFO
,"client went away (unexpected EOF)");
swfile= 0;
disconnect(8);
}
swfile= 0;
disconnect(8);
}
@@
-183,7
+185,7
@@
static void getevent(struct event_msg *event_r) {
blocksignals();
syslog(LOG_ERR,"client sent bad file descriptor %d to close (max %d)",
fd,fdarrayused-1);
blocksignals();
syslog(LOG_ERR,"client sent bad file descriptor %d to close (max %d)",
fd,fdarrayused-1);
- disconnect(
12
);
+ disconnect(
20
);
}
if (fdarray[fd].holdfd!=-1) {
if (close(fdarray[fd].holdfd)) syscallerror("cannot close holding fd");
}
if (fdarray[fd].holdfd!=-1) {
if (close(fdarray[fd].holdfd)) syscallerror("cannot close holding fd");
@@
-192,7
+194,7
@@
static void getevent(struct event_msg *event_r) {
break;
case et_disconnect:
blocksignals();
break;
case et_disconnect:
blocksignals();
- syslog(LOG_
DEBUG
,"client disconnected");
+ syslog(LOG_
INFO
,"client disconnected");
disconnect(4);
default:
return;
disconnect(4);
default:
return;
@@
-218,7
+220,7
@@
void syscallerror(const char *what) {
e= errno;
blocksignals();
syslog(LOG_ERR,"system call failure: %s: %s",what,strerror(e));
e= errno;
blocksignals();
syslog(LOG_ERR,"system call failure: %s: %s",what,strerror(e));
- disconnect(1
8
);
+ disconnect(1
6
);
}
/* Functions which may be called from signal handlers. These
}
/* Functions which may be called from signal handlers. These
@@
-287,7
+289,7
@@
static void NONRETURNING sighandler_chld(int ignored) {
xfwrite(&progress_mbuf,sizeof(progress_mbuf),swfile);
xfflush(swfile);
xfwrite(&progress_mbuf,sizeof(progress_mbuf),swfile);
xfflush(swfile);
- syslog(LOG_
DEBUG
,"service completed (status %d %d)",(status>>8)&0x0ff,status&0x0ff);
+ syslog(LOG_
INFO
,"service completed (status %d %d)",(status>>8)&0x0ff,status&0x0ff);
_exit(0);
}
_exit(0);
}
@@
-327,7
+329,7
@@
static void NONRETURNING generalfailure(const char *prefix, int reserveerrno,
strnytcat(errmsg,strerror(errnoval),sizeof(errmsg));
}
senderrmsgstderr(errmsg);
strnytcat(errmsg,strerror(errnoval),sizeof(errmsg));
}
senderrmsgstderr(errmsg);
- syslog(LOG_
DEBUG
,"service failed (%s)",errmsg);
+ syslog(LOG_
INFO
,"service failed (%s)",errmsg);
disconnect(12);
}
disconnect(12);
}
@@
-412,7
+414,8
@@
static void receive_request(void) {
xfread(&request_mbuf,sizeof(request_mbuf));
serviceuser= xfreadsetstring(request_mbuf.serviceuserlen);
service= xfreadsetstring(request_mbuf.servicelen);
xfread(&request_mbuf,sizeof(request_mbuf));
serviceuser= xfreadsetstring(request_mbuf.serviceuserlen);
service= xfreadsetstring(request_mbuf.servicelen);
- logname= xfreadsetstring(request_mbuf.lognamelen);
+ assert(request_mbuf.spoofed==0 || request_mbuf.spoofed==1);
+ loginname= xfreadsetstring(request_mbuf.loginnamelen);
cwd= xfreadsetstring(request_mbuf.cwdlen);
if (request_mbuf.overridelen >= 0) {
assert(request_mbuf.overridelen <= MAX_OVERRIDE_LEN);
cwd= xfreadsetstring(request_mbuf.cwdlen);
if (request_mbuf.overridelen >= 0) {
assert(request_mbuf.overridelen <= MAX_OVERRIDE_LEN);
@@
-494,9
+497,9
@@
static void groupnames(int ngids, gid_t *gids, const char ***names_r) {
static void lookup_uidsgids(void) {
struct passwd *pw;
static void lookup_uidsgids(void) {
struct passwd *pw;
- pw= getpwnam(logname);
+ pw= getpwnam(log
in
name);
if (!pw) miscerror("look up calling user");
if (!pw) miscerror("look up calling user");
- assert(!strcmp(pw->pw_name,logname));
+ assert(!strcmp(pw->pw_name,log
in
name));
callinguser_shell= xstrsave(pw->pw_shell);
pw= getpwnam(serviceuser);
callinguser_shell= xstrsave(pw->pw_shell);
pw= getpwnam(serviceuser);
@@
-506,12
+509,15
@@
static void lookup_uidsgids(void) {
serviceuser_shell= xstrsave(pw->pw_shell);
serviceuser_uid= pw->pw_uid;
serviceuser_shell= xstrsave(pw->pw_shell);
serviceuser_uid= pw->pw_uid;
+ if (setregid(pw->pw_gid,pw->pw_gid)) syscallerror("setregid 1");
if (initgroups(pw->pw_name,pw->pw_gid)) syscallerror("initgroups");
if (setreuid(pw->pw_uid,pw->pw_uid)) syscallerror("setreuid 1");
if (setreuid(pw->pw_uid,pw->pw_uid)) syscallerror("setreuid 2");
if (initgroups(pw->pw_name,pw->pw_gid)) syscallerror("initgroups");
if (setreuid(pw->pw_uid,pw->pw_uid)) syscallerror("setreuid 1");
if (setreuid(pw->pw_uid,pw->pw_uid)) syscallerror("setreuid 2");
- if (pw->pw_uid)
+ if (pw->pw_uid)
{
if (!setreuid(pw->pw_uid,0)) miscerror("setreuid 3 unexpectedly succeeded");
if (!setreuid(pw->pw_uid,0)) miscerror("setreuid 3 unexpectedly succeeded");
- if (errno != EPERM) syscallerror("setreuid 3 failed in unexpected way");
+ if (errno != EPERM) syscallerror("setreuid 3 failed in unexpected way");
+ }
+ if (setregid(pw->pw_gid,pw->pw_gid)) syscallerror("setregid 2");
service_ngids= getgroups(0,0); if (service_ngids == -1) syscallerror("getgroups(0,0)");
if (service_ngids > MAX_GIDS) miscerror("service user is in far too many groups");
service_ngids= getgroups(0,0); if (service_ngids == -1) syscallerror("getgroups(0,0)");
if (service_ngids > MAX_GIDS) miscerror("service user is in far too many groups");
@@
-595,6
+601,7
@@
static void makenonexistentfd(int fd) {
if (fdarray[fd].holdfd != -1) {
if (close(fdarray[fd].holdfd))
syscallfailure("close unwanted hold descriptor for %d",fd);
if (fdarray[fd].holdfd != -1) {
if (close(fdarray[fd].holdfd))
syscallfailure("close unwanted hold descriptor for %d",fd);
+ fdarray[fd].holdfd= -1;
}
}
}
}
}
}
@@
-711,9
+718,13
@@
void servicerequest(int sfd) {
setup_comms(sfd);
send_opening();
receive_request();
setup_comms(sfd);
send_opening();
receive_request();
+ if (request_mbuf.clientpid == (pid_t)-1) _exit(2);
establish_pipes();
lookup_uidsgids();
debug_dumprequest(mypid);
establish_pipes();
lookup_uidsgids();
debug_dumprequest(mypid);
+ syslog(LOG_INFO,"%s %s -> %s %c %s",
+ request_mbuf.spoofed ? "spoof" : "user",
+ loginname, serviceuser, overridedata?'!':':', service);
if (overridedata)
r= parse_string(TOPLEVEL_OVERRIDDEN_CONFIGURATION,
if (overridedata)
r= parse_string(TOPLEVEL_OVERRIDDEN_CONFIGURATION,