Changeset 35cdda2

Timestamp:

Feb 3, 2019, 9:00:15 PM (5 years ago)

Author:

GitHub <noreply@github.com>

Parents:

9a0d25d (diff), f0bd871 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Adam Glasgall <adam@crossproduct.net> (02/03/19 21:00:15)

git-committer:

GitHub <noreply@github.com> (02/03/19 21:00:15)

Message:

Merge f0bd8711665d2a12e30c1b1e3a5f055a410afa4f into 9a0d25d1513e92f2b0c99d89ab5fc5ae2c061151

Files:

• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Message.pm (modified) (3 diffs)
• perl/modules/Makefile.am (modified) (1 diff)
• perl/modules/Zulip/Makefile.PL (added)
• perl/modules/Zulip/README (added)
• perl/modules/Zulip/lib/BarnOwl/Message/Zulip.pm (added)
• perl/modules/Zulip/lib/BarnOwl/Module/Zulip.pm (added)
• perlglue.xs (modified) (2 diffs)
• configure.ac (modified) (3 diffs)
• filter.c (modified) (2 diffs)
• functions.c (modified) (4 diffs)
• zcrypt.c (modified) (11 diffs)

perl/lib/BarnOwl.pm

@@ -9 +9 @@
                     zephyr_getsender zephyr_getrealm zephyr_zwrite
                     zephyr_stylestrip zephyr_smartstrip_user zephyr_getsubs
-                    queue_message admin_message
+                    queue_message get_message_by_id admin_message
                     start_edit
                     start_question start_password start_edit_win

perl/lib/BarnOwl/Message.pm

@@ -102 +102 @@
     my $s;
     for my $f (keys %$this) {
-        my $val = $this->{$f};
-        if (ref($val) eq "ARRAY") {
-            for my $i (0..@$val-1) {
-                my $aval;
-                $aval = $val->[$i];
-                $aval =~ s/\n/\n$f.$i: /g;
-                $s .= "$f.$i: $aval\n";
-            }
-        } else {
-            $val =~ s/\n/\n$f: /g;
-            $s .= "$f: $val\n";
-        }
+        my $val = $this->{$f};
+        if (ref($val) eq "ARRAY") {
+            for my $i (0..@$val-1) {
+                my $aval;
+                $aval = $val->[$i];
+                $aval =~ s/\n/\n$f.$i: /g;
+                $s .= "$f.$i: $aval\n";
+            }
+        } else {
+            $val =~ s/\n/\n$f: /g;
+            $s .= "$f: $val\n";
+        }
     }
     return $s;
@@ -304 +304 @@
     $BarnOwl::auth       = $m->auth      ;
     if ($m->fields) {
-        @BarnOwl::fields = @{$m->fields};
-        @main::fields = @{$m->fields};
+        @BarnOwl::fields = @{$m->fields};
+        @main::fields = @{$m->fields};
     } else {
-        @BarnOwl::fields = undef;
-        @main::fields = undef;
+        @BarnOwl::fields = undef;
+        @main::fields = undef;
     }
 }
@@ -331 +331 @@
 
 1;
+
+# Local Variables:
+# indent-tabs-mode: nil
+# End:

perl/modules/Makefile.am

@@ -1 @@
-MODULES = Jabber IRC WordWrap Twitter Facebook Kerberos
+MODULES = Jabber IRC WordWrap Twitter Facebook Kerberos Zulip
 
 EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/lib)

perlglue.xs

@@ -60 +60 @@
         OUTPUT:
                 RETVAL
-
+        
 int
 getnumcols()
@@ -156 +156 @@
                 RETVAL
 
+SV *
+get_message_by_id(id)
+    int id
+    PREINIT:
+           owl_message *m;
+           owl_messagelist *ml;
+    CODE:
+    {
+            ml = owl_global_get_msglist(&g);
+            m = owl_messagelist_get_by_id(ml, id);
+            if(!m) {
+                    croak("No message with id %d!", id);
+            }
+            RETVAL = owl_perlconfig_message2hashref(m);
+    }
+OUTPUT:
+        RETVAL
+
+                
 void
 admin_message(header, body)

configure.ac

@@ -54 +54 @@
   [with_zephyr=check])
 
-AC_ARG_WITH([krb4],
-  AS_HELP_STRING([--with-krb4],
-                 [Build with kerberos IV]))
-
 AS_IF([test "x$with_zephyr" != xno],
-  [have_krb4=no
-
-   AS_IF([test "x$with_krb4" != "xno"],
-   [AC_MSG_CHECKING([for Kerberos IV])
-    AS_IF([krb5-config krb4 --libs >/dev/null 2>&1],
-      [AC_MSG_RESULT([yes])
-       have_krb4=yes
-       AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
-       AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
-       LIBS="${LIBS} `krb5-config krb4 --libs`"
-      ],
-      [AC_MSG_RESULT([no])
-       AS_IF([test "x$with_krb4" = "xyes"],
-             [AC_MSG_ERROR([Kerberos IV requested but not found])])])])
-
-   AS_IF([test "x$have_krb4" != xyes],
-     [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto],
-        [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
-         LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
-        ],
-        [PKG_CHECK_MODULES([OPENSSL], [openssl],
-           [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
-            LIBS="${LIBS} ${OPENSSL_LIBS}"
-           ])])])
+  [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto],
+     [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
+      LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
+     ],
+     [PKG_CHECK_MODULES([OPENSSL], [openssl],
+        [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
+         LIBS="${LIBS} ${OPENSSL_LIBS}"
+        ])])
 
    AC_CHECK_LIB([zephyr], [ZGetSender],
@@ -102 +82 @@
 AC_CHECK_FUNCS([use_default_colors])
 AC_CHECK_FUNCS([resizeterm], [], [AC_MSG_ERROR([No resizeterm found])])
-AC_CHECK_FUNCS([des_string_to_key DES_string_to_key], [HAVE_DES_STRING_TO_KEY=1])
-AC_CHECK_FUNCS([des_ecb_encrypt DES_ecb_encrypt], [HAVE_DES_ECB_ENCRYPT=1])
-AC_CHECK_FUNCS([des_key_sched DES_key_sched], [HAVE_DES_KEY_SCHED=1])
+AC_CHECK_FUNCS([DES_string_to_key], [HAVE_DES_STRING_TO_KEY=1])
+AC_CHECK_FUNCS([DES_ecb_encrypt], [HAVE_DES_ECB_ENCRYPT=1])
+AC_CHECK_FUNCS([DES_key_sched], [HAVE_DES_KEY_SCHED=1])
 
 dnl Checks for header files.
@@ -181 +161 @@
 
 AM_CFLAGS="$AM_CFLAGS -D_XOPEN_SOURCE=600"
-dnl Define _BSD_SOURCE because zephyr needs caddr_t.
-AM_CFLAGS="$AM_CFLAGS -D_BSD_SOURCE"
+dnl Define _BSD_SOURCE/_DEFAULT_SOURCE because zephyr needs caddr_t.
+AM_CFLAGS="$AM_CFLAGS -D_BSD_SOURCE -D_DEFAULT_SOURCE"
 dnl Define __EXTENSIONS__ for strcasecmp on Solaris.
 AM_CFLAGS="$AM_CFLAGS -D__EXTENSIONS__"

filter.c

@@ -16 +16 @@
 owl_filter *owl_filter_new(const char *name, int argc, const char *const *argv)
 {
+  return owl_filter_new_colored(name, argc, argv, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
+}
+
+owl_filter *owl_filter_new_colored(const char *name, int argc, const char *const *argv, int fgcolor, int bgcolor)
+{
   owl_filter *f;
 
@@ -21 +26 @@
 
   f->name=g_strdup(name);
-  f->fgcolor=OWL_COLOR_DEFAULT;
-  f->bgcolor=OWL_COLOR_DEFAULT;
-
-  /* first take arguments that have to come first */
-  /* set the color */
-  while ( argc>=2 && ( !strcmp(argv[0], "-c") ||
-                       !strcmp(argv[0], "-b") ) ) {
-    if (owl_util_string_to_color(argv[1])==OWL_COLOR_INVALID) {
-      owl_function_error("The color '%s' is not available, using default.", argv[1]);
-    } else {
-      switch (argv[0][1]) {
-      case 'c':
-        f->fgcolor=owl_util_string_to_color(argv[1]);
-        break;
-      case 'b':
-        f->bgcolor=owl_util_string_to_color(argv[1]);
-        break;
-      }
-    }
-    argc-=2;
-    argv+=2;
-  }
+  f->fgcolor = fgcolor;
+  f->bgcolor = bgcolor;
 
   if (!(f->root = owl_filter_parse_expression(argc, argv, NULL))) {

functions.c

@@ -1980 +1980 @@
   const owl_view *v;
   int inuse = 0;
+  int i = 2;
+  int fgcolor = OWL_COLOR_DEFAULT;
+  bool set_fgcolor = false;
+  int bgcolor = OWL_COLOR_DEFAULT;
+  bool set_bgcolor = false;
 
   if (argc < 2) {
@@ -1996 +2001 @@
   }
 
-  /* deal with the case of trying change the filter color */
-  if (argc==4 && !strcmp(argv[2], "-c")) {
+  /* set the color */
+  while (i + 2 <= argc && (!strcmp(argv[i], "-c") ||
+                           !strcmp(argv[i], "-b"))) {
+    int color = owl_util_string_to_color(argv[i + 1]);
+    if (color == OWL_COLOR_INVALID) {
+      owl_function_error("The color '%s' is not available.", argv[i + 1]);
+    } else if (argv[i][1] == 'c') {
+      fgcolor = color;
+      set_fgcolor = true;
+    } else {
+      bgcolor = color;
+      set_bgcolor = true;
+    }
+    i += 2;
+  }
+
+  if (i > 2 && i == argc) {
     f=owl_global_get_filter(&g, argv[1]);
     if (!f) {
@@ -2003 +2023 @@
       return false;
     }
-    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
-      owl_function_error("The color '%s' is not available.", argv[3]);
+    if (!set_fgcolor && !set_bgcolor)
       return false;
-    }
-    owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3]));
-    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    return false;
-  }
-  if (argc==4 && !strcmp(argv[2], "-b")) {
-    f=owl_global_get_filter(&g, argv[1]);
-    if (!f) {
-      owl_function_error("The filter '%s' does not exist.", argv[1]);
-      return false;
-    }
-    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
-      owl_function_error("The color '%s' is not available.", argv[3]);
-      return false;
-    }
-    owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3]));
+    if (set_fgcolor)
+      owl_filter_set_fgcolor(f, fgcolor);
+    if (set_bgcolor)
+      owl_filter_set_bgcolor(f, bgcolor);
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     return true;
@@ -2027 +2034 @@
 
   /* create the filter and check for errors */
-  f = owl_filter_new(argv[1], argc-2, argv+2);
+  f = owl_filter_new_colored(argv[1], argc - i, argv + i, fgcolor, bgcolor);
   if (f == NULL) {
     owl_function_error("Invalid filter: %s", argv[1]);

zcrypt.c

@@ -21 +21 @@
 #include <config.h>
 
-#ifdef HAVE_KERBEROS_IV
-#include <kerberosIV/des.h>
-#else
 #include <openssl/des.h>
-#endif
 
 #include "filterproc.h"
@@ -99 +95 @@
 };
 
-static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule *schedule) {
-#ifdef HAVE_KERBEROS_IV
-  des_cblock key;
-#else
-  des_cblock _key, *key = &_key;
-#endif
-
-  des_string_to_key(keystring, key);
-  des_key_sched(key, *schedule);
+static void owl_zcrypt_string_to_schedule(char *keystring, DES_key_schedule *schedule) {
+  DES_cblock key;
+
+  DES_string_to_key(keystring, &key);
+  DES_key_sched(&key, schedule);
 }
 
@@ -728 +720 @@
 int do_encrypt_des(const char *keyfile, const char *in, int length, FILE *outfile)
 {
-  des_key_schedule schedule;
+  DES_key_schedule schedule;
   unsigned char input[8], output[8];
   const char *inptr;
@@ -774 +766 @@
 
     /* Encrypt and output the block */
-    des_ecb_encrypt(&input, &output, schedule, TRUE);
+    DES_ecb_encrypt(&input, &output, &schedule, TRUE);
     block_to_ascii(output, outfile);
 
@@ -790 +782 @@
   char *out;
   int err, status;
+  int tried_gpg1 = FALSE;
   const char *argv[] = {
-    "gpg",
+    "gpg1",
     "--symmetric",
     "--no-options",
@@ -805 +798 @@
     NULL
   };
-  err = call_filter(argv, in, &out, &status);
+  while ((err = call_filter(argv, in, &out, &status)) && !out && !tried_gpg1) {
+    tried_gpg1 = TRUE;
+    argv[0] = "gpg";
+  }
   if(err || status) {
     g_free(out);
@@ -874 +870 @@
   char *in, *out;
   int length;
+  int tried_gpg1 = FALSE;
   const char *argv[] = {
-    "gpg",
+    "gpg1",
     "--decrypt",
     "--no-options",
@@ -892 +889 @@
   if(!in) return FALSE;
 
-  err = call_filter(argv, in, &out, &status);
+  while ((err = call_filter(argv, in, &out, &status)) && !out && !tried_gpg1) {
+    tried_gpg1 = TRUE;
+    argv[0] = "gpg";
+  }
   free(in);
   if(err || status) {
@@ -905 +905 @@
 
 int do_decrypt_des(const char *keyfile) {
-  des_key_schedule schedule;
+  DES_key_schedule schedule;
   unsigned char input[8], output[8];
   char tmp[9];
@@ -915 +915 @@
     have a NULL-terminated string we can call printf/strlen on.
 
-    We don't pass 'tmp' to des_ecb_encrypt directly, because it's
+    We don't pass 'tmp' to DES_ecb_encrypt directly, because it's
     prototyped as taking 'unsigned char[8]', and this avoids a stupid
     cast.
@@ -933 +933 @@
   while (read_ascii_block(input))
   {
-    des_ecb_encrypt(&input, &output, schedule, FALSE);
+    DES_ecb_encrypt(&input, &output, &schedule, FALSE);
     memcpy(tmp, output, 8);
     printf("%s", tmp);