DistRen Changeset - 11f92cc7df63 · protofusion repositories

Changeset - 11f92cc7df63

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-08-01 13:09:24

Fixes to remove key from slave

2 files changed with 3 insertions and 4 deletions:

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -52,79 +52,78 @@ for(counter=0; counter<argc; counter++){ @@
+}
 	if(argc>1
 		&& (strcmp("-c", argv[1]) == 0))
+	{
 		char *username;
 		char *email;
 		if(argc != 4)
+		{
 			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'distrenslave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!\n'", argc - 1);
 			return 234;
+		}
 		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.\n");
 			return 0;
+		}
 		else{
 			fprintf(stderr,"Please try again! :D\n");
 			return 0;
+		}
+	}
 /* 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;
 cfg_opt_t myopts[] = {
 		CFG_SIMPLE_STR("username", &username),
 		CFG_END()
 		};
 struct options_common *commonopts;
 options_init(argc,argv,&my_cfg, myopts, "slave", &commonopts);
 /* End option getter */
 /* If there's no key or username in the conf, or if they're at the default (!key/!username) let the user know! */
 	if(username == NULL || strcmp(username, "!username") == 0 ){
 	  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
+	}
 	else if( username != NULL || strcmp(username,"!username") != 0 ){
-		fprintf(stderr, "Your username is %s, and your key is %s.\n",username, key);
 		fprintf(stderr, "Your username is %s\n",username);
 		// Logs ya in:
 		if(login_user(username) == 1){
 			fprintf(stderr,"You should now be logged into distren.\n");
+		}
 		else{
 			fprintf(stderr,"Login failed. I have no clue why. Goodbye.\n");
 			return 0;
+		}
+	}
 	else{
 	  fprintf(stderr,"Something is terribly wrong!!!");
+	}
 /* Somewhat pseudo Rendering code */
 /*
 	if('slave recieves "start frame#, job#"'){
 		fprintf(stderr, "Received %d in job %d, preparing to render...",framenum,jobnum);
 		get('http://distren.protofusion.org/srv/job%d.tgz', jobnum); // use curl
 		exec('tar -xvf job%d.tgz /tmp/distren/job%d',jobnum,jobnum); // somehow
 		exec_blender("GIVE ME SOME ARGS!"); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later)
 		// Consider placing the following in the exec_blender() function

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -82,49 +82,49 @@ int ssh_keygen(){ @@
 	char *cmd[] = { command, "-q", "-f", SYSCONFDIR "/distren.id_rsa", "-N", "", (char *)NULL }; // TODO: Give me the correct args!
 	char buf[10];
 	struct execio *testrem;
 	size_t readlen;
 	ret = execio_open(&testrem, command, cmd); // This path will be absolute for testing, should be relative to install on production
 	buf[9] = '\0'; // null-terminating the array...
 	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);
 /* 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!");
+		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!
   /*
    * 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 buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
       "distren_setup@protofusion.org",
       "-i",
       SYSCONFDIR "/setup_rsa", // default distributed key, account can only create users.

0 comments (0 inline, 0 general)