DistRen Changeset - addf1a3579d8 · protofusion repositories

Changeset - addf1a3579d8

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-08-01 14:39:06

Moved ssh_keygen() and conf_replace() before the useradd code to avoid duplicate user creation, etc.

1 file changed with 14 insertions and 13 deletions:

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -88,101 +88,102 @@ int ssh_keygen(){ @@
 	      if(readlen > 9) {
 		fprintf(stderr, "Something is terribly wrong!\n");
+	      }
 	      buf[readlen] = '\0';
 	      fprintf(stderr, "read \"%s\"\n", buf);
+	    }
 	execio_close(testrem);
 	/* end execio code */
 	// Supposedly execio returns 1 if it has bad args.
 	if(ret == 1){
 		fprintf(stderr, "Generating your key failed. Ensure that ssh-keygen is present!\n"); // Use different executor that searches the path? there is one...
 		return 0;
+	}
 	else{
 		fprintf(stderr,"We successfully generated your key! Yay!\n");
 		return 1;
+	}
 return 0;
+}
 /** Registers the user on the DistRen server */
 int register_user(char *username, char *email)
+{
 	/* @TODO: Check for problems (e.g. existing rsa key) BEFORE useradding! */
 /* Note: this code moved here from after the useradd code, so useradd doesn't happen if there is an existing key, etc */
   /* puts the person's username in the conf */
   if(conf_replace(username) == 0){
 	fprintf(stderr, "Failed!\n");
 	return 0;
+	}
   /* generates keys for login, @TODO: pub key must somehow be sent to the server. */
   if(ssh_keygen() == 0){
 	  fprintf(stderr, "Failed!\n");
 	  return 0;
+  }
   /*
    * All created user accounts should be sandboxed accordingly, requiring a different skel, and the default shell to be rbash. Also,
    * a custom path defined in the .bashrc of the skel is needed.
    */
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
       "distren_setup@protofusion.org",
       "-i",
       SYSCONFDIR "/setup_rsa", // @TODO: How will we distribute this key?
       "-p",
       "23",
       "newuser",
       "-M",
       "-c",
       email,
       "-d",
       "/home/distren",
       "--gid",
       "541",
       username,
       (char *)NULL
     };
   size_t readlen;
   execio_open(&testrem, "ssh", execargv); // TODO: Grab returns from this someday.
   buf[9] = '\0';
   while(!execio_read(testrem, buf, 9, &readlen))
+    {
       if(readlen > 9) {
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
       buf[readlen] = '\0';
       fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   /* @TODO: Parse the output buffer or something to check when user creation fails due to duplicate users. This is pretty important. */
   // puts the person's username in the conf
   if(conf_replace(username) == 0){
 	  fprintf(stderr, "Failed!\n");
 	  return 0;
+  }
   // generates keys for login, @TODO: pub key must somehow be sent to the server.
   if(ssh_keygen() == 0){
 	  fprintf(stderr, "Failed!\n");
 	  return 0;
+  }
   return 1; // 1 is success
+}
 /** Logs the user into the server after ensuring that keys exist */
 int login_user(char *username)
+{
   char *userhost;
   userhost = malloc(strlen(username) + strlen("@protofusion.org") + 1);
   if(!userhost)
     return 43;
   strcpy(userhost, username);
   strcat(userhost, "@protofusion.org"); // Throws @protofusion.org after the username
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
       userhost,// username and hostname
       "-i",
       SYSCONFDIR "/distren.id_rsa",
       "-p",
       "23",
       "echo",

0 comments (0 inline, 0 general)