whitelist cleanups
[util-vserver.git] / src / vsh.c
index c8f3417..8ea3645 100644 (file)
--- a/src/vsh.c
+++ b/src/vsh.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <limits.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <syscall.h>
 
 //--------------------------------------------------------------------
 #include "vserver.h"
+#include "planetlab.h"
 
 #undef CONFIG_VSERVER_LEGACY
 
-/* Null byte made explicit */
-#define NULLBYTE_SIZE                    1
-
+#if 0
 /* Base for all vserver roots for chroot */
 #define VSERVER_ROOT_BASE       "/vservers"
 
-static int
-_PERROR(const char *format, char *file, int line, int _errno, ...)
-{
-       va_list ap;
-
-       va_start(ap, _errno);
-       fprintf(stderr, "%s:%d: ", file, line);
-       vfprintf(stderr, format, ap);
-       if (_errno)
-               fprintf(stderr, ": %s (%d)", strerror(_errno), _errno);
-       fputs("\n", stderr);
-       fflush(stderr);
-
-       return _errno;
-}
-
-#define PERROR(format, args...) _PERROR(format, __FILE__, __LINE__, errno, ## args)
-
 /* Change to root:root (before entering new context) */
 static int setuidgid_root()
 {
@@ -199,70 +180,7 @@ static int sandbox_chroot(uid_t uid)
        return 0;
 }
 
-#define WHITESPACE(buffer,index,len)     \
-  while(isspace((int)buffer[index])) \
-       if (index < len) index++; else goto out;
-
-struct resources {
-       char *name;
-       unsigned long long *limit;
-};
-
-#define VSERVERCONF "/etc/vservers/"
-static void get_limits(char *context, struct resources *list){
-       FILE *fb;
-       size_t len = strlen(VSERVERCONF) + strlen(context) + strlen(".conf") + NULLBYTE_SIZE;
-       char *conf = (char *)malloc(len);       
-       struct resources *r;
-
-       sprintf(conf, "%s%s.conf", VSERVERCONF, context);
-
-       /* open the conf file for reading */
-       fb = fopen(conf,"r");
-       if (fb != NULL) {
-               size_t index;
-               char *buffer = malloc(1000);
-               char *p;
-
-               /* the conf file exist */ 
-               while((p=fgets(buffer,1000-1,fb))!=NULL) {
-                       index = 0;
-                       len = strnlen(buffer,1000);
-                       WHITESPACE(buffer,index,len);
-                       if (buffer[index] == '#') 
-                               continue;
-
-                       for (r=list; r->name; r++)
-                               if ((p=strstr(&buffer[index],r->name))!=NULL) {
-                                       /* adjust index into buffer */
-                                       index+= (p-&buffer[index])+strlen(r->name);
-
-                                       /* skip over whitespace */
-                                       WHITESPACE(buffer,index,len);
-
-                                       /* expecting to see = sign */
-                                       if (buffer[index++]!='=') goto out;
-
-                                       /* skip over whitespace */
-                                       WHITESPACE(buffer,index,len);
-
-                                       /* expecting to see a digit for number */
-                                       if (!isdigit((int)buffer[index])) goto out;
-
-                                       *r->limit = atoi(&buffer[index]);
-                                       break;
-                               }
-               }
-       out:
-               free(buffer);
-       } else {
-               fprintf(stderr,"cannot open %s\n",conf);
-       }
-       free(conf);
-}
-
-
-static int sandbox_processes(xid_t xid, char *context)
+static int sandbox_processes(xid_t ctx, char *context)
 {
 #ifdef CONFIG_VSERVER_LEGACY
        int     flags;
@@ -271,7 +189,7 @@ static int sandbox_processes(xid_t xid, char *context)
        flags |= 1; /* VX_INFO_LOCK -- cannot request a new vx_id */
        /* flags |= 4; VX_INFO_NPROC -- limit number of procs in a context */
 
-       (void) vc_new_s_context(xid, 0, flags);
+       (void) vc_new_s_context(ctx, 0, flags);
 
        /* use legacy dirty hack for capremove */
        if (vc_new_s_context(VC_SAMECTX, vc_get_insecurebcaps(), flags) == VC_NOCTX) {
@@ -280,118 +198,36 @@ static int sandbox_processes(xid_t xid, char *context)
                exit(1);
        }
 #else
-       struct vc_rlimit limits;
-       struct vc_ctx_caps caps;
-       struct vc_ctx_flags flags;
-
-       xid_t ctx;
-       unsigned long long cpu = VC_LIM_KEEP;
-       unsigned long long mem = VC_LIM_KEEP;
-       unsigned long long task = VC_LIM_KEEP;
-       unsigned long long cpuguaranteed = 0;
-       struct resources list[] = 
-               {{"MEMLIMIT", &mem},
-                {"CPULIMIT", &cpu},
-                {"CPUGUARANTEED", &cpuguaranteed},
-                {"TASKLIMIT", &task},
-                {0,0}};
-
-       get_limits(context,list);
-       (void) (sandbox_chroot(xid));
-
-       caps.ccaps = ~vc_get_insecureccaps();
-       caps.cmask = ~0ull;
-       caps.bcaps = ~vc_get_insecurebcaps();
-       caps.bmask = ~0ull;
-
-       flags.flagword = VC_VXF_INFO_LOCK;
-       flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK;
-
-       ctx = vc_ctx_create(xid);
-       if (ctx == VC_NOCTX && errno != EEXIST) {
-               PERROR("vc_ctx_create(%d)", xid);
-               exit(1);
-       }
-
-       /* CPU    */
-       if (cpu != VC_LIM_KEEP) {
-               struct vc_set_sched sched = {
-                       .set_mask = 0
-               };
-
-               /* Need to distinguish between guarantee (hard) and
-                * best effort (share) from the vserver
-                * configuration.
-                */
-#define VC_VXF_SCHED_SHARE       0x00000800ull
-               flags.flagword |= VC_VXF_SCHED_HARD;
-               flags.mask |= VC_VXF_SCHED_HARD;
-               if (cpuguaranteed==0) {
-                       flags.flagword |= VC_VXF_SCHED_SHARE;
-                       flags.mask |= VC_VXF_SCHED_SHARE;
-               }
-
-               /* CPULIMIT value from /etc/vservers/xyz.conf */
-               sched.fill_rate = cpu;
-               sched.set_mask |= VC_VXSM_FILL_RATE;
-
-               sched.interval  = 1000; /* Andy's default value */
-               sched.set_mask |= VC_VXSM_INTERVAL;
-
-               /* set base token value for new contexts */
-               if (ctx != VC_NOCTX) {
-                       sched.tokens = 100; /* Andy's default value */
-                       sched.set_mask |= VC_VXSM_TOKENS;
-               }
-
-               sched.tokens_min = 50; /* Andy's default value */
-               sched.tokens_max = 100; /* Andy's default value */
-               sched.set_mask |= VC_VXSM_TOKENS_MIN;
-               sched.set_mask |= VC_VXSM_TOKENS_MAX;
-
-               if (vc_set_sched(xid, &sched)==-1) {
-                       PERROR("vc_set_sched()");
-                       exit(1);
-               }
-       }
-
-       /* MEM    */
-       limits.min  = VC_LIM_KEEP;
-       limits.soft = VC_LIM_KEEP;
-       limits.hard = mem;
-       if (vc_set_rlimit(xid, RLIMIT_RSS, &limits)) {
-               PERROR("vc_set_rlimit(%d, %d, %d/%d/%d)",
-                      xid, RLIMIT_RSS, limits.min, limits.soft, limits.hard);
-               exit(1);
-       }
-       
-       /* TASK   */
-       limits.min  = VC_LIM_KEEP;
-       limits.soft = VC_LIM_KEEP;
-       limits.hard = task;
-       if (vc_set_rlimit(xid, RLIMIT_NPROC, &limits)) {
-               PERROR("vc_set_rlimit(%d, %d, %d/%d/%d)",
-                      xid, RLIMIT_NPROC, limits.min, limits.soft, limits.hard);
-               exit(1);
-       }
-       
-       if (vc_set_ccaps(xid, &caps) == -1) {
-               PERROR("vc_set_ccaps(%d, 0x%16ullx/0x%16ullx, 0x%16ullx/0x%16ullx)",
-                      xid, caps.ccaps, caps.cmask, caps.bcaps, caps.bmask);
-               exit(1);
-       }
-
-       if (vc_set_cflags(xid, &flags) == -1) {
-               PERROR("vc_set_cflags(%d, 0x%16llx/0x%16llx)",
-                      xid, flags.flagword, flags.mask);
-               exit(1);
-       }
-
-       /* context already exists, migrate to it */
-       if (ctx == VC_NOCTX && vc_ctx_migrate(xid) == -1) {
-               PERROR("vc_ctx_migrate(%d)", xid);
-               exit(1);
-       }
+       int  ctx_is_new;
+       struct sliver_resources slr;
+       char hostname[HOST_NAME_MAX+1];
+       pl_get_limits(context,&slr);
+
+       if (gethostname(hostname, sizeof hostname) == -1)
+         {
+           PERROR("gethostname(...)");
+           exit(1);
+         }
+
+       /* check whether the slice has been suspended */
+       if (slr.vs_cpu==0)
+         {
+           fprintf(stderr, "*** %s: %s has zero cpu resources and presumably it has been disabled/suspended ***\n", hostname, context);
+           exit(0);
+         }
+
+       (void) (sandbox_chroot(ctx));
+
+        if ((ctx_is_new = pl_chcontext(ctx, ~vc_get_insecurebcaps(),&slr)) < 0)
+          {
+            PERROR("pl_chcontext(%u)", ctx);
+            exit(1);
+          }
+       if (ctx_is_new)
+         {
+           pl_set_limits(ctx,&slr);
+           pl_setup_done(ctx);
+         }
 #endif
        return 0;
 }
@@ -637,3 +473,10 @@ int main(int argc, char **argv)
 
     return 0; /* shutup compiler */
 }
+#else
+int main(int argc, char *argv[])
+{
+       
+       return 0;
+}
+#endif