Added oauth to mhparam examples.

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index f169fc7d81db995cf9f09c66dcfee8f90e5aa468..bf3825442ff80751cf27c2188e99f1200169159b 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -8,7 +8,13 @@
  */
 
 #ifdef MAILGROUP
  */
 
 #ifdef MAILGROUP

-/* Revised: Sat Apr 14 17:08:17 PDT 1990 (marvit@hplabs)
+/*
+ * Thu Feb 12 21:00 CST 2015            Marcin Cieslak <saper@saper.info>
+ *    Replaced setgid() calls with setegid() so that it works with dot
+ *    locking on FreeBSD.  setegid() should be supported on modern POSIX
+ *    systems.
+ *
+ * Revised: Sat Apr 14 17:08:17 PDT 1990 (marvit@hplabs)

  *    Added hpux hacks to set and reset gid to be "mail" as needed. The reset
  *    is necessary so inc'ed mail is the group of the inc'er, rather than
  *    "mail". We setgid to egid only when [un]locking the mail file. This
  *    Added hpux hacks to set and reset gid to be "mail" as needed. The reset
  *    is necessary so inc'ed mail is the group of the inc'er, rather than
  *    "mail". We setgid to egid only when [un]locking the mail file. This


@@ -29,7 +35,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>

-

 #include <h/dropsbr.h>
 #include <h/popsbr.h>
 #include <h/fmt_scan.h>
 #include <h/dropsbr.h>
 #include <h/popsbr.h>
 #include <h/fmt_scan.h>


@@ -37,8 +42,6 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>

-#include <errno.h>
-#include <signal.h>

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)


@@ -66,10 +69,11 @@
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \

-    X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmech", SASLminc(-8), SASLMECHSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", SASLminc(5), SASLSW) \
+    X("nosasl", SASLminc(3), NOSASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \

     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,


@@ -130,10 +134,16 @@ static FILE *pf = NULL;
  * For setting and returning to "mail" gid
  */
 #ifdef MAILGROUP
  * For setting and returning to "mail" gid
  */
 #ifdef MAILGROUP

-static int return_gid;
+static gid_t return_gid;

 #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS()
 #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS()

-#define DROPGROUPPRIVS() setgid(getgid())
-#define GETGROUPPRIVS() setgid(return_gid)
+#define DROPGROUPPRIVS() \
+    if (setegid(getgid()) != 0) { \
+        adios ("setegid", "unable to restore group to %ld", (long) getgid()); \
+    }
+#define GETGROUPPRIVS() \
+    if (setegid(return_gid) != 0) { \
+        adios ("setegid", "unable to set group to %ld", (long) return_gid); \
+    }

 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
 /* define *GROUPPRIVS() as null; this avoids having lots of "#ifdef MAILGROUP"s */
 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
 /* define *GROUPPRIVS() as null; this avoids having lots of "#ifdef MAILGROUP"s */


@@ -174,14 +184,14 @@ int
 main (int argc, char **argv)
 {
     int chgflag = 1, trnflag = 1;
 main (int argc, char **argv)
 {
     int chgflag = 1, trnflag = 1;

-    int noisy = 1, width = 0;
+    int noisy = 1, width = -1;

     int hghnum = 0, msgnum = 0;
     int sasl = 0;
     int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */
     char *cp, *maildir = NULL, *folder = NULL;
     char *format = NULL, *form = NULL;
     char *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     int hghnum = 0, msgnum = 0;
     int sasl = 0;
     int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */
     char *cp, *maildir = NULL, *folder = NULL;
     char *format = NULL, *form = NULL;
     char *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;

-    char *audfile = NULL, *from = NULL, *saslmech = NULL;
+    char *audfile = NULL, *from = NULL, *saslmech = NULL, *auth_svc = NULL;

     char buf[BUFSIZ], **argp, *nfs, **arguments;
     struct msgs *mp = NULL;
     struct stat st, s1;
     char buf[BUFSIZ], **argp, *nfs, **arguments;
     struct msgs *mp = NULL;
     struct stat st, s1;


@@ -190,9 +200,7 @@ main (int argc, char **argv)
     char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
 
     int nmsgs, nbytes;
     char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
 
     int nmsgs, nbytes;

-    char *pass = NULL;

     char *MAILHOST_env_variable;
     char *MAILHOST_env_variable;

-

     done=inc_done;
 
 /* absolutely the first thing we do is save our privileges,
     done=inc_done;
 
 /* absolutely the first thing we do is save our privileges,


@@ -201,15 +209,9 @@ main (int argc, char **argv)
     SAVEGROUPPRIVS();
     TRYDROPGROUPPRIVS();
 
     SAVEGROUPPRIVS();
     TRYDROPGROUPPRIVS();
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 


@@ -351,6 +353,16 @@ main (int argc, char **argv)
                if (!(saslmech = *argp++) || *saslmech == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
                if (!(saslmech = *argp++) || *saslmech == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;

+
+           case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+                if (!(auth_svc = *argp++) || *auth_svc == '-')
+                    adios (NULL, "missing argument to %s", argp[-2]);
+#else
+                adios (NULL, "not built with OAuth support");
+#endif
+                continue;
+

            case PROXYSW:
                if (!(proxy = *argp++) || *proxy == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
            case PROXYSW:
                if (!(proxy = *argp++) || *proxy == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);


@@ -391,18 +403,25 @@ main (int argc, char **argv)
      * a POP server?
      */
     if (inc_type == INC_POP) {
      * a POP server?
      */
     if (inc_type == INC_POP) {

-       if (user == NULL)
-           user = getusername ();
-       if (sasl)
-           pass = getusername ();
-       else
-           ruserpass (host, &user, &pass);
+       struct nmh_creds creds = { 0, 0, 0 };
+
+       if (auth_svc == NULL) {
+           if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
+               adios (NULL, "must specify -authservice with -saslmech xoauth2");
+           }
+           nmh_get_credentials (host, user, sasl, &creds);
+       } else {
+           if (user == NULL) {
+               adios (NULL, "must specify -user with -saslmech xoauth2");
+           }
+           creds.user = user;
+       }

 
        /*
         * initialize POP connection
         */
 
        /*
         * initialize POP connection
         */

-       if (pop_init (host, port, user, pass, proxy, snoop, sasl,
-                     saslmech) == NOTOK)
+       if (pop_init (host, port, creds.user, creds.password, proxy, snoop,
+                     sasl, saslmech, auth_svc) == NOTOK)

            adios (NULL, "%s", response);
 
        /* Check if there are any messages */
            adios (NULL, "%s", response);
 
        /* Check if there are any messages */


@@ -555,10 +574,15 @@ go_to_it:
        else if (i == NOTOK)
            chmod (audfile, m_gmprot ());
 
        else if (i == NOTOK)
            chmod (audfile, m_gmprot ());
 

-       fprintf (aud, from ? "<<inc>> %s -ms %s\n"
-                : host ? "<<inc>> %s -host %s -user %s\n"
-                : "<<inc>> %s\n",
-                dtimenow (0), from ? from : host, user);
+       if (from)
+           fprintf (aud, "<<inc>> %s -ms %s\n", dtimenow(0), from);
+       else {
+           if (host)
+               fprintf (aud, "<<inc>> %s -host %s -user %s\n", dtimenow(0),
+                        host, user);
+           else
+               fprintf (aud, "<<inc>> %s\n", dtimenow (0));
+       }

     }
 
     /* Get new format string */
     }
 
     /* Get new format string */


@@ -581,7 +605,7 @@ go_to_it:
                if (errno != ENOENT)
                    adios (packfile, "error on file");
                cp = concat ("Create file \"", packfile, "\"? ", NULL);
                if (errno != ENOENT)
                    adios (packfile, "error on file");
                cp = concat ("Create file \"", packfile, "\"? ", NULL);

-               if (noisy && !getanswer (cp))
+               if (noisy && !read_yes_or_no_if_tty (cp))

                    done (1);
                free (cp);
            }
                    done (1);
                free (cp);
            }


@@ -596,12 +620,16 @@ go_to_it:
        }
 
        for (i = 1; i <= nmsgs; i++) {
        }
 
        for (i = 1; i <= nmsgs; i++) {

+           charstring_t scanl = NULL;
+

            msgnum++;
            if (packfile) {
                fseek (pf, 0L, SEEK_CUR);
                pos = ftell (pf);
                size = 0;
            msgnum++;
            if (packfile) {
                fseek (pf, 0L, SEEK_CUR);
                pos = ftell (pf);
                size = 0;

-               fwrite (mmdlm1, 1, strlen (mmdlm1), pf);
+               if (fwrite (mmdlm1, 1, strlen (mmdlm1), pf) < strlen (mmdlm1)) {
+                   advise (mmdlm1, "fwrite");
+               }

                start = ftell (pf);
 
                if (pop_retr (i, pop_pack) == NOTOK)
                start = ftell (pf);
 
                if (pop_retr (i, pop_pack) == NOTOK)


@@ -628,7 +656,7 @@ go_to_it:
            }
            switch (incerr = scan (pf, msgnum, 0, nfs, width,
                              packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag,
            }
            switch (incerr = scan (pf, msgnum, 0, nfs, width,
                              packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag,

-                             1, NULL, stop - start, noisy)) {
+                             1, NULL, stop - start, noisy, &scanl)) {

            case SCNEOF: 
                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;
            case SCNEOF: 
                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;


@@ -647,14 +675,18 @@ go_to_it:
            case SCNENC:
            default: 
                if (aud)
            case SCNENC:
            default: 
                if (aud)

-                   fputs (scanl, aud);
+                   fputs (charstring_buffer (scanl), aud);

                if (noisy)
                    fflush (stdout);
                break;
            }
                if (noisy)
                    fflush (stdout);
                break;
            }

+           charstring_free (scanl);
+

            if (packfile) {
                fseek (pf, stop, SEEK_SET);
            if (packfile) {
                fseek (pf, stop, SEEK_SET);

-               fwrite (mmdlm2, 1, strlen (mmdlm2), pf);
+               if (fwrite (mmdlm2, 1, strlen (mmdlm2), pf) < strlen (mmdlm1)) {
+                   advise (mmdlm2, "fwrite");
+               }

                if (fflush (pf) || ferror (pf)) {
                    int e = errno;
                    pop_quit ();
                if (fflush (pf) || ferror (pf)) {
                    int e = errno;
                    pop_quit ();


@@ -665,7 +697,7 @@ go_to_it:
            } else {
                if (ferror(pf) || fclose (pf)) {
                    int e = errno;
            } else {
                if (ferror(pf) || fclose (pf)) {
                    int e = errno;

-                   unlink (cp);
+                   (void) m_unlink (cp);

                    pop_quit ();
                    errno = e;
                    adios (cp, "write error on");
                    pop_quit ();
                    errno = e;
                    adios (cp, "write error on");


@@ -675,6 +707,8 @@ go_to_it:
 
            if (trnflag && pop_dele (i) == NOTOK)
                adios (NULL, "%s", response);
 
            if (trnflag && pop_dele (i) == NOTOK)
                adios (NULL, "%s", response);

+
+           scan_finished();

        }
 
        if (pop_quit () == NOTOK)
        }
 
        if (pop_quit () == NOTOK)


@@ -692,9 +726,12 @@ go_to_it:
        scan_detect_mbox_style (in);            /* the MAGIC invocation... */
        hghnum = msgnum = mp->hghmsg;
        for (;;) {
        scan_detect_mbox_style (in);            /* the MAGIC invocation... */
        hghnum = msgnum = mp->hghmsg;
        for (;;) {

+           charstring_t scanl = NULL;
+

            /* create scanline for new message */
            switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
            /* create scanline for new message */
            switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,

-                             msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+                             msgnum == hghnum && chgflag, 1, NULL, 0L, noisy,
+                             &scanl)) {

            case SCNFAT:
            case SCNEOF: 
                break;
            case SCNFAT:
            case SCNEOF: 
                break;


@@ -723,13 +760,15 @@ go_to_it:
                (void)ext_hook("add-hook", b, (char *)0);
 
                if (aud)
                (void)ext_hook("add-hook", b, (char *)0);
 
                if (aud)

-                   fputs (scanl, aud);
+                   fputs (charstring_buffer (scanl), aud);

                if (noisy)
                    fflush (stdout);
 
                msgnum++;
                continue;
            }
                if (noisy)
                    fflush (stdout);
 
                msgnum++;
                continue;
            }

+           charstring_free (scanl);
+

            /* If we get here there was some sort of error from scan(),
             * so stop processing anything more from the spool.
             */
            /* If we get here there was some sort of error from scan(),
             * so stop processing anything more from the spool.
             */


@@ -742,6 +781,8 @@ go_to_it:
 
        hghnum = msgnum = mp->hghmsg;
        for (i = 0; i < num_maildir_entries; i++) {
 
        hghnum = msgnum = mp->hghmsg;
        for (i = 0; i < num_maildir_entries; i++) {

+           charstring_t scanl = NULL;
+

            msgnum++;
 
            sp = Maildir[i].filename;
            msgnum++;
 
            sp = Maildir[i].filename;


@@ -760,7 +801,7 @@ go_to_it:
                        break;
                if (ferror(sf) || fflush(pf) || ferror(pf)) {
                        int e = errno;
                        break;
                if (ferror(sf) || fflush(pf) || ferror(pf)) {
                        int e = errno;

-                       fclose(pf); fclose(sf); unlink(cp);
+                       fclose(pf); fclose(sf); (void) m_unlink(cp);

                        errno = e;
                        adios(cp, "copy error %s -> %s", sp, cp);
                }
                        errno = e;
                        adios(cp, "copy error %s -> %s", sp, cp);
                }


@@ -774,7 +815,7 @@ go_to_it:
            fseek (pf, 0L, SEEK_SET);
            switch (incerr = scan (pf, msgnum, 0, nfs, width,
                              msgnum == mp->hghmsg + 1 && chgflag,
            fseek (pf, 0L, SEEK_SET);
            switch (incerr = scan (pf, msgnum, 0, nfs, width,
                              msgnum == mp->hghmsg + 1 && chgflag,

-                             1, NULL, stop - start, noisy)) {
+                             1, NULL, stop - start, noisy, &scanl)) {

            case SCNEOF: 
                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;
            case SCNEOF: 
                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;


@@ -800,23 +841,27 @@ go_to_it:
                (void)ext_hook("add-hook", b, (char *)0);
 
                if (aud)
                (void)ext_hook("add-hook", b, (char *)0);
 
                if (aud)

-                   fputs (scanl, aud);
+                   fputs (charstring_buffer (scanl), aud);

                if (noisy)
                    fflush (stdout);
                break;
            }
                if (noisy)
                    fflush (stdout);
                break;
            }

+           charstring_free (scanl);
+

            if (ferror(pf) || fclose (pf)) {
                int e = errno;
            if (ferror(pf) || fclose (pf)) {
                int e = errno;

-               unlink (cp);
+               (void) m_unlink (cp);

                errno = e;
                adios (cp, "write error on");
            }
            pf = NULL;
            free (cp);
 
                errno = e;
                adios (cp, "write error on");
            }
            pf = NULL;
            free (cp);
 

-           if (trnflag && unlink (sp) == NOTOK)
+           if (trnflag && m_unlink (sp) == NOTOK)

                adios (sp, "couldn't unlink");
            free (sp); /* Free Maildir[i]->filename */
                adios (sp, "couldn't unlink");
            free (sp); /* Free Maildir[i]->filename */

+
+           scan_finished();

        }
        free (Maildir); /* From now on Maildir is just a flag - don't dref! */
     }
        }
        free (Maildir); /* From now on Maildir is just a flag - don't dref! */
     }


@@ -856,7 +901,7 @@ go_to_it:
                    close (newfd);
                else
                    admonish (newmail, "error zero'ing");
                    close (newfd);
                else
                    admonish (newmail, "error zero'ing");

-               unlink(map_name(newmail));
+               (void) m_unlink(map_name(newmail));

            }
        } else {
            if (noisy)
            }
        } else {
            if (noisy)


@@ -935,6 +980,7 @@ skip:
 static void
 inc_done (int status)
 {
 static void
 inc_done (int status)
 {

+    done = exit;

     if (packfile && pd != NOTOK)
        mbx_close (packfile, pd);
     if (locked)
     if (packfile && pd != NOTOK)
        mbx_close (packfile, pd);
     if (locked)


@@ -961,9 +1007,9 @@ pop_pack (char *s)
     char buffer[BUFSIZ];
 
     snprintf (buffer, sizeof(buffer), "%s\n", s);
     char buffer[BUFSIZ];
 
     snprintf (buffer, sizeof(buffer), "%s\n", s);

-    for (j = 0; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
+    for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)

        continue;
        continue;

-    for (j = 0; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
+    for ( ; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)

        continue;
     fputs (buffer, pf);
     size += strlen (buffer) + 1;
        continue;
     fputs (buffer, pf);
     size += strlen (buffer) + 1;