/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2018-04-01 19:27:30 UTC
  • Revision ID: teddy@recompile.se-20180401192730-jwr4io5cb3x5u268
Don't print NULL string pointers in error message output

* plugins.d/mandos-client.c (pgp_packet_decrypt): If decryption fails,
  don't print unsupported_algorithm if it is NULL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
9
9
 * "browse_callback", and parts of "main".
10
10
 * 
11
11
 * Everything else is
12
 
 * Copyright © 2008-2016 Teddy Hogeborn
13
 
 * Copyright © 2008-2016 Björn Påhlsson
14
 
 * 
15
 
 * This program is free software: you can redistribute it and/or
16
 
 * modify it under the terms of the GNU General Public License as
17
 
 * published by the Free Software Foundation, either version 3 of the
18
 
 * License, or (at your option) any later version.
19
 
 * 
20
 
 * This program is distributed in the hope that it will be useful, but
 
12
 * Copyright © 2008-2018 Teddy Hogeborn
 
13
 * Copyright © 2008-2018 Björn Påhlsson
 
14
 * 
 
15
 * This file is part of Mandos.
 
16
 * 
 
17
 * Mandos is free software: you can redistribute it and/or modify it
 
18
 * under the terms of the GNU General Public License as published by
 
19
 * the Free Software Foundation, either version 3 of the License, or
 
20
 * (at your option) any later version.
 
21
 * 
 
22
 * Mandos is distributed in the hope that it will be useful, but
21
23
 * WITHOUT ANY WARRANTY; without even the implied warranty of
22
24
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
23
25
 * General Public License for more details.
24
26
 * 
25
27
 * You should have received a copy of the GNU General Public License
26
 
 * along with this program.  If not, see
27
 
 * <http://www.gnu.org/licenses/>.
 
28
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
28
29
 * 
29
30
 * Contact the authors at <mandos@recompile.se>.
30
31
 */
47
48
                                   strtof(), abort() */
48
49
#include <stdbool.h>            /* bool, false, true */
49
50
#include <string.h>             /* strcmp(), strlen(), strerror(),
50
 
                                   asprintf(), strncpy() */
 
51
                                   asprintf(), strncpy(), strsignal()
 
52
                                */
51
53
#include <sys/ioctl.h>          /* ioctl */
52
54
#include <sys/types.h>          /* socket(), inet_pton(), sockaddr,
53
55
                                   sockaddr_in6, PF_INET6,
418
420
      if(result == NULL){
419
421
        fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
420
422
      } else {
421
 
        fprintf_plus(stderr, "Unsupported algorithm: %s\n",
422
 
                     result->unsupported_algorithm);
 
423
        if(result->unsupported_algorithm != NULL) {
 
424
          fprintf_plus(stderr, "Unsupported algorithm: %s\n",
 
425
                       result->unsupported_algorithm);
 
426
        }
423
427
        fprintf_plus(stderr, "Wrong key usage: %u\n",
424
428
                     result->wrong_key_usage);
425
429
        if(result->file_name != NULL){
611
615
        }
612
616
        params.size += (unsigned int)bytes_read;
613
617
      }
 
618
      ret = close(dhpfile);
 
619
      if(ret == -1){
 
620
        perror_plus("close");
 
621
      }
614
622
      if(params.data == NULL){
615
623
        dhparamsfilename = NULL;
616
624
      }
625
633
                     safer_gnutls_strerror(ret));
626
634
        dhparamsfilename = NULL;
627
635
      }
 
636
      free(params.data);
628
637
    } while(false);
629
638
  }
630
639
  if(dhparamsfilename == NULL){
1077
1086
    bool match = false;
1078
1087
    {
1079
1088
      char *interface = NULL;
1080
 
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
1081
 
                                 interface))){
 
1089
      while((interface = argz_next(mc->interfaces,
 
1090
                                   mc->interfaces_size,
 
1091
                                   interface))){
1082
1092
        if(if_nametoindex(interface) == (unsigned int)if_index){
1083
1093
          match = true;
1084
1094
          break;
1237
1247
           with an explicit route added with the server's address.
1238
1248
           
1239
1249
           Avahi bug reference:
1240
 
           http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
 
1250
           https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1241
1251
           https://bugs.debian.org/587961
1242
1252
        */
1243
1253
        if(debug){
1423
1433
                                               &decrypted_buffer, mc);
1424
1434
    if(decrypted_buffer_size >= 0){
1425
1435
      
 
1436
      clearerr(stdout);
1426
1437
      written = 0;
1427
1438
      while(written < (size_t) decrypted_buffer_size){
1428
1439
        if(quit_now){
1444
1455
        }
1445
1456
        written += (size_t)ret;
1446
1457
      }
 
1458
      ret = fflush(stdout);
 
1459
      if(ret != 0){
 
1460
        int e = errno;
 
1461
        if(debug){
 
1462
          fprintf_plus(stderr, "Error writing encrypted data: %s\n",
 
1463
                       strerror(errno));
 
1464
        }
 
1465
        errno = e;
 
1466
        goto mandos_end;
 
1467
      }
1447
1468
      retval = 0;
1448
1469
    }
1449
1470
  }
1480
1501
  return retval;
1481
1502
}
1482
1503
 
1483
 
__attribute__((nonnull))
1484
1504
static void resolve_callback(AvahiSServiceResolver *r,
1485
1505
                             AvahiIfIndex interface,
1486
1506
                             AvahiProtocol proto,
1641
1661
      perror_plus("ioctl SIOCGIFFLAGS");
1642
1662
      errno = old_errno;
1643
1663
    }
 
1664
    if((close(s) == -1) and debug){
 
1665
      old_errno = errno;
 
1666
      perror_plus("close");
 
1667
      errno = old_errno;
 
1668
    }
1644
1669
    return false;
1645
1670
  }
 
1671
  if((close(s) == -1) and debug){
 
1672
    old_errno = errno;
 
1673
    perror_plus("close");
 
1674
    errno = old_errno;
 
1675
  }
1646
1676
  return true;
1647
1677
}
1648
1678
 
1909
1939
      return;
1910
1940
    }
1911
1941
  }
 
1942
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1943
  if(devnull == -1){
 
1944
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1945
    return;
 
1946
  }
1912
1947
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1913
1948
                           runnable_hook, alphasort);
1914
1949
  if(numhooks == -1){
1915
1950
    perror_plus("scandir");
 
1951
    close(devnull);
1916
1952
    return;
1917
1953
  }
1918
1954
  struct dirent *direntry;
1919
1955
  int ret;
1920
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1921
 
  if(devnull == -1){
1922
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1923
 
    return;
1924
 
  }
1925
1956
  for(int i = 0; i < numhooks; i++){
1926
1957
    direntry = direntries[i];
1927
1958
    if(debug){
2183
2214
  
2184
2215
  /* Sleep checking until interface is running.
2185
2216
     Check every 0.25s, up to total time of delay */
2186
 
  for(int i=0; i < delay * 4; i++){
 
2217
  for(int i = 0; i < delay * 4; i++){
2187
2218
    if(interface_is_running(interface)){
2188
2219
      break;
2189
2220
    }
2485
2516
  
2486
2517
  {
2487
2518
    /* Work around Debian bug #633582:
2488
 
       <http://bugs.debian.org/633582> */
 
2519
       <https://bugs.debian.org/633582> */
2489
2520
    
2490
2521
    /* Re-raise privileges */
2491
2522
    ret = raise_privileges();
2946
2977
 end:
2947
2978
  
2948
2979
  if(debug){
2949
 
    fprintf_plus(stderr, "%s exiting\n", argv[0]);
 
2980
    if(signal_received){
 
2981
      fprintf_plus(stderr, "%s exiting due to signal %d: %s\n",
 
2982
                   argv[0], signal_received,
 
2983
                   strsignal(signal_received));
 
2984
    } else {
 
2985
      fprintf_plus(stderr, "%s exiting\n", argv[0]);
 
2986
    }
2950
2987
  }
2951
2988
  
2952
2989
  /* Cleanup things */
3004
3041
      /* Take down the network interfaces which were brought up */
3005
3042
      {
3006
3043
        char *interface = NULL;
3007
 
        while((interface=argz_next(interfaces_to_take_down,
3008
 
                                   interfaces_to_take_down_size,
3009
 
                                   interface))){
 
3044
        while((interface = argz_next(interfaces_to_take_down,
 
3045
                                     interfaces_to_take_down_size,
 
3046
                                     interface))){
3010
3047
          ret = take_down_interface(interface);
3011
3048
          if(ret != 0){
3012
3049
            errno = ret;
3041
3078
                                                | O_PATH));
3042
3079
    if(dir_fd == -1){
3043
3080
      perror_plus("open");
 
3081
      return;
3044
3082
    }
3045
3083
    int numentries = scandirat(dir_fd, ".", &direntries,
3046
3084
                               notdotentries, alphasort);
3063
3101
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3064
3102
            dret = 0;
3065
3103
          }
3066
 
          if(dret == -1){
 
3104
          if((dret == -1) and (errno != ENOENT)){
3067
3105
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3068
3106
                         direntries[i]->d_name, strerror(errno));
3069
3107
          }
3073
3111
      
3074
3112
      /* need to clean even if 0 because man page doesn't specify */
3075
3113
      free(direntries);
3076
 
      if(numentries == -1){
3077
 
        perror_plus("scandirat");
3078
 
      }
3079
3114
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3080
3115
      if(dret == -1 and errno != ENOENT){
3081
3116
        perror_plus("rmdir");