X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Ftest-passwd.c;h=ac5bf99213873d24138e800e23a45283b9695aad;hp=9ef2cfe190daeb7fd488bffc989975b5819b85f2;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28

diff --git a/driver/test-passwd.c b/driver/test-passwd.c
index 9ef2cfe1..ac5bf992 100644
--- a/driver/test-passwd.c
+++ b/driver/test-passwd.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1998, 2001 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1998-2007 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -32,6 +32,7 @@
 #include "resources.h"
 #include "version.h"
 #include "visual.h"
+#include "auth.h"
 
 char *progname = 0;
 char *progclass = 0;
@@ -58,7 +59,6 @@ void saver_exit (saver_info *si, int status, const char *core) { exit(status);}
 int move_mouse_grab (saver_info *si, Window to, Cursor c, int ts) { return 0; }
 int mouse_screen (saver_info *si) { return 0; }
 void check_for_leaks (const char *where) { }
-void exec_command (const char *shell, const char *command, int nice) { }
 void shutdown_stderr (saver_info *si) { }
 
 const char *blurb(void) { return progname; }
@@ -75,8 +75,9 @@ get_screen_viewport (saver_screen_info *ssi,
   *y_ret = 0;
   *w_ret = WidthOfScreen (ssi->screen);
   *h_ret = HeightOfScreen (ssi->screen);
-}
 
+  if (*w_ret > *h_ret * 2) *w_ret /= 2;  /* xinerama kludge */
+}
 
 void
 idle_timer (XtPointer closure, XtIntervalId *id)
@@ -90,6 +91,57 @@ idle_timer (XtPointer closure, XtIntervalId *id)
 }
 
 
+static int
+text_auth_conv (
+  int num_msg,
+  const struct auth_message *auth_msgs,
+  struct auth_response **resp,
+  saver_info *si)
+{
+  char *input;
+  char buf[255];
+  struct auth_response *responses;
+  int i;
+
+  responses = calloc(num_msg, sizeof(struct auth_response));
+  if (!responses)
+    return -1;
+
+  /* The unlock state won't actually be used until this function returns and
+   * the auth module processes the response, but set it anyway for consistency
+   */
+  si->unlock_state = ul_read;
+
+  for (i = 0; i < num_msg; ++i)
+    {
+      printf ("\n%s: %s", progname, auth_msgs[i].msg);
+      if (   auth_msgs[i].type == AUTH_MSGTYPE_PROMPT_NOECHO
+          || auth_msgs[i].type == AUTH_MSGTYPE_PROMPT_ECHO)
+        {
+          input = fgets (buf, sizeof(buf)-1, stdin);
+          if (!input || !*input)
+            exit (0);
+          if (input[strlen(input)-1] == '\n')
+            input[strlen(input)-1] = 0;
+
+          responses[i].response = strdup(input);
+        }
+    }
+
+  *resp = responses;
+
+  si->unlock_state = ul_finished;
+
+  return 0;
+}
+
+
+#ifdef __GNUC__
+ __extension__     /* shut up about "string length is greater than the length
+                      ISO C89 compilers are required to support" when including
+                      the .ad file... */
+#endif
+
 static char *fallback[] = {
 #include "XScreenSaver_ad.h"
  0
@@ -104,6 +156,7 @@ main (int argc, char **argv)
   saver_info sip;
   saver_info *si = &sip;
   saver_preferences *p = &si->prefs;
+  struct passwd *pw;
 
   memset(&sip, 0, sizeof(sip));
   memset(&ssip, 0, sizeof(ssip));
@@ -135,16 +188,26 @@ main (int argc, char **argv)
       exit (1);
     }
 
+#ifdef NO_LOCKING
+  if (which == PASS || which == TTY)
+    {
+      fprintf (stderr, "%s: compiled with NO_LOCKING\n", progname);
+      exit (1);
+    }
+#endif
+
+#ifndef NO_LOCKING
   /* before hack_uid() for proper permissions */
   lock_priv_init (argc, argv, True);
 
   hack_uid (si);
 
-  if (! lock_init (argc, argv, si->prefs.verbose_p))
+  if (! lock_init (argc, argv, True))
     {
       si->locking_disabled_p = True;
       si->nolock_reason = "error getting password";
     }
+#endif
 
   progclass = "XScreenSaver";
 
@@ -167,28 +230,44 @@ main (int argc, char **argv)
         visual_depth(si->default_screen->screen,
                      si->default_screen->current_visual);
 
+      /* I could call get_screen_viewport(), but it is not worthwhile.
+       * These are used by the save_under pixmap. */
+      ssip.width = WidthOfScreen(ssip.screen);
+      ssip.height = HeightOfScreen(ssip.screen);
+
       db = p->db;
       XtGetApplicationNameAndClass (si->dpy, &progname, &progclass);
 
-      load_init_file (&si->prefs);
-
+      load_init_file (si->dpy, &si->prefs);
     }
 
   p->verbose_p = True;
 
+  pw = getpwuid (getuid ());
+  si->user = strdup (pw->pw_name);
+
   while (1)
     {
+#ifndef NO_LOCKING
       if (which == PASS)
         {
-          if (unlock_p (si))
-            fprintf (stderr, "%s: password correct\n", progname);
+	  si->unlock_cb = gui_auth_conv;
+          si->auth_finished_cb = auth_finished_cb;
+
+	  xss_authenticate(si, True);
+
+          if (si->unlock_state == ul_success)
+            fprintf (stderr, "%s: authentication succeeded\n", progname);
           else
-            fprintf (stderr, "%s: password INCORRECT!\n", progname);
+            fprintf (stderr, "%s: authentication FAILED!\n", progname);
 
           XSync(si->dpy, False);
+          fprintf (stderr, "\n######################################\n\n");
           sleep (3);
         }
-      else if (which == SPLASH)
+      else
+#endif
+      if (which == SPLASH)
         {
           XEvent event;
           make_splash_dialog (si);
@@ -204,25 +283,23 @@ main (int argc, char **argv)
           XSync (si->dpy, False);
           sleep (1);
         }
+#ifndef NO_LOCKING
       else if (which == TTY)
         {
-          char *pass;
-          char buf[255];
-          struct passwd *p = getpwuid (getuid ());
-          printf ("\n%s: %s's password: ", progname, p->pw_name);
+          si->unlock_cb = text_auth_conv;
 
-          pass = fgets (buf, sizeof(buf)-1, stdin);
-          if (!pass || !*pass)
-            exit (0);
-          if (pass[strlen(pass)-1] == '\n')
-            pass[strlen(pass)-1] = 0;
+          printf ("%s: Authenticating user %s\n", progname, si->user);
+          xss_authenticate(si, True);
 
-          if (passwd_valid_p (pass, True))
+          if (si->unlock_state == ul_success)
             printf ("%s: Ok!\n", progname);
           else
             printf ("%s: Wrong!\n", progname);
         }
+#endif
       else
         abort();
     }
+
+  free(si->user);
 }