DistRen Changeset - 8feb0005e773 · protofusion repositories

Changeset - 8feb0005e773

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca - 16 years ago 2009-07-28 17:04:15

ssh_keygen executes nicely, someone find the args for non-interactive, dies on errors, but doesn't die hard enough.

3 files changed with 22 insertions and 8 deletions:

src/server/slave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -24,24 +24,25 @@ @@
+ *
  * Slave listens on server for a command in the format of each function...
  * We need if's for returns... ==> watchdog
  * **********************************************************************************
 */
 // Provides DISTREN_REQUEST* which is in reality, DISTREN_SEND(signal) in the minds of your average joe
 #include "protocol.h"
 #include "options.h" // Confuse, etc.
 #include "slavefuncs.h" // Slave functions
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 int slavestatus = 0; // Ugh global vars
 int main(int argc, char *argv[])
+{
 int jobnum;
 char *jobname;
 int framenum;
 int counter;
 /* Parses arguments, skips if there are no args */
@@ @@ -64,28 +65,28 @@ for(counter=0; counter<argc; counter++){ @@
+		}
 		username = argv[2];
 		email = argv[3];
 		if(!strchr(email, '@'))
+		{
 			fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
 			return 235;
+		}
 		if( register_user(username, email) == 1){
 			// register_user generates a key, too */
 			fprintf(stderr,"Registration successfull. You may now invoke distrenslave with no arguments.");
+			fprintf(stderr,"Registration successfull. You may now invoke distrenslave with no arguments.\n");
+		}
 		else{
 			fprintf(stderr,"Registration failed. Sorry!");
+			fprintf(stderr,"Registration failed. Sorry!\n");
+		}
+	}
 /* End arg parser */
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
 char *username;
 char *key;
 username = NULL;
 key = NULL;
 cfg_t * my_cfg;

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -14,38 +14,51 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
  /*
   * Registration on server. Needs attention. Prevent account spamming.
   * distrenslave -c username email@example.com
  */
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 void ssh_keygen(){
 	// Give me some args!
 int ssh_keygen(){
 	fprintf(stderr, "We're generating your SSH key. Please be patient.\n");
 	char *command = "ssh-keygenn"; // append .exe if win32?
 	char *path_to_command = "/usr/bin/ssh-keygenn";
 	int ret;
 	char *cmd[] = { command, "-b", "-o", (char *)0 }; // TODO: Give me the correct args!
 	ret = execv(path_to_command, cmd); // This path will be absolute for testing, should be relative to install on production
 	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!");
 		return 1;
+	}
 return 0;
+}
 int register_user(char *username, char *email)
+{
   /*
    * Logs into sandboxed user on zserver2 and registers a user. Should eventually generate a key on the server and return it to the user.
    * 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 .bash_profile of the skel is needed.
    */
   char *keyname; // Url to the key
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
       "distren_setup@protofusion.org",
       "-i",
       "setup.rsa", // default distributed key, account can only create users.
       "-p",
       "23",
       "sudo /usr/sbin/useradd",
       "-M",
@@ @@ -62,25 +75,25 @@ int register_user(char *username, char * @@
   fprintf(stderr, "Opening stream:\n", execio_open(&testrem, "ssh", execargv));
   buf[9] = '\0'; // null-terminating the array...
   while(!execio_read(testrem, buf, 9, &readlen)) // What's with the readlen stuff?
+    {
       if(readlen > 9) {
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
       buf[readlen] = '\0'; // Null-terminating the end of it again based on how large the data is?
       fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
-  ssh_keygen(); // Should return relative path to keyfile, or jus the keyname
+  ssh_keygen(); // generates username.rsa
   /* TODO: Scan distrenslave.conf for !username and !key and replace them with "keyname" and the "username" */
   return 1;
+}
 int login_user(char *username){
 	// TODO: Why does this segfault???
   fprintf(stderr, "Logging you in...");
   char *userhost = strcpy(userhost, username);
   char *userkey = strcpy(userkey, username);
   strcat(userhost, "@protofusion.org"); // Throws @protofusion.org after the username

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -12,20 +12,20 @@ @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _DISTREN_SLAVEFUNCS_H
 #define _DISTREN_SLAVEFUNCS_H
 #include "blendjob.h"
-void ssh_keygen();
+int ssh_keygen();
 int register_user(char *username, char *email);
 int login_user(char *username);
 void conf_replace(char *username, char *key);
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame);
 #endif

0 comments (0 inline, 0 general)