/mandos/release

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

« back to all changes in this revision

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

  • Committer: Teddy Hogeborn
  • Date: 2014-06-15 02:48:49 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140615024849-68x3q8g4yzadl33s
mandos: New "--no-zeroconf" option.  Also make "--socket=0" work.

* mandos (main): New "--no-zeroconf" option.  Also do not interpret
                 socket=0 as no socket.
* mandos-options.xml (zeroconf): New.
* mandos.conf (socket, zeroconf): New.
* mandos.xml (SYNOPSIS, OPTIONS): Added "--no-zeroconf".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
234
234
                          .af = af };
235
235
  if(new_server->ip == NULL){
236
236
    perror_plus("strdup");
237
 
    free(new_server);
238
237
    return false;
239
238
  }
240
239
  ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));
241
240
  if(ret == -1){
242
241
    perror_plus("clock_gettime");
243
 
#ifdef __GNUC__
244
 
#pragma GCC diagnostic push
245
 
#pragma GCC diagnostic ignored "-Wcast-qual"
246
 
#endif
247
 
    free((char *)(new_server->ip));
248
 
#ifdef __GNUC__
249
 
#pragma GCC diagnostic pop
250
 
#endif
251
 
    free(new_server);
252
242
    return false;
253
243
  }
254
244
  /* Special case of first server */
493
483
  return plaintext_length;
494
484
}
495
485
 
496
 
__attribute__((warn_unused_result, const))
497
 
static const char *safe_string(const char *str){
498
 
  if(str == NULL)
499
 
    return "(unknown)";
500
 
  return str;
501
 
}
502
 
 
503
486
__attribute__((warn_unused_result))
504
487
static const char *safer_gnutls_strerror(int value){
505
488
  const char *ret = gnutls_strerror(value);
506
 
  return safe_string(ret);
 
489
  if(ret == NULL)
 
490
    ret = "(unknown)";
 
491
  return ret;
507
492
}
508
493
 
509
494
/* GnuTLS log function callback */
518
503
                              const char *seckeyfilename,
519
504
                              mandos_context *mc){
520
505
  int ret;
521
 
  unsigned int uret;
522
506
  
523
507
  if(debug){
524
508
    fprintf_plus(stderr, "Initializing GnuTLS\n");
575
559
                 safer_gnutls_strerror(ret));
576
560
    goto globalfail;
577
561
  }
578
 
  if(mc->dh_bits == 0){
579
 
    /* Find out the optimal number of DH bits */
580
 
    /* Try to read the private key file */
581
 
    gnutls_datum_t buffer = { .data = NULL, .size = 0 };
582
 
    {
583
 
      int secfile = open(seckeyfilename, O_RDONLY);
584
 
      size_t buffer_capacity = 0;
585
 
      while(true){
586
 
        buffer_capacity = incbuffer((char **)&buffer.data,
587
 
                                    (size_t)buffer.size,
588
 
                                    (size_t)buffer_capacity);
589
 
        if(buffer_capacity == 0){
590
 
          perror_plus("incbuffer");
591
 
          free(buffer.data);
592
 
          buffer.data = NULL;
593
 
          break;
594
 
        }
595
 
        ssize_t bytes_read = read(secfile, buffer.data + buffer.size,
596
 
                                  BUFFER_SIZE);
597
 
        /* EOF */
598
 
        if(bytes_read == 0){
599
 
          break;
600
 
        }
601
 
        /* check bytes_read for failure */
602
 
        if(bytes_read < 0){
603
 
          perror_plus("read");
604
 
          free(buffer.data);
605
 
          buffer.data = NULL;
606
 
          break;
607
 
        }
608
 
        buffer.size += (unsigned int)bytes_read;
609
 
      }
610
 
      close(secfile);
611
 
    }
612
 
    /* If successful, use buffer to parse private key */
613
 
    gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA;
614
 
    if(buffer.data != NULL){
615
 
      {
616
 
        gnutls_openpgp_privkey_t privkey = NULL;
617
 
        ret = gnutls_openpgp_privkey_init(&privkey);
618
 
        if(ret != GNUTLS_E_SUCCESS){
619
 
          fprintf_plus(stderr, "Error initializing OpenPGP key"
620
 
                       " structure: %s", safer_gnutls_strerror(ret));
621
 
          free(buffer.data);
622
 
          buffer.data = NULL;
623
 
        } else {
624
 
          ret = gnutls_openpgp_privkey_import(privkey, &buffer,
625
 
                                            GNUTLS_OPENPGP_FMT_BASE64,
626
 
                                              "", 0);
627
 
          if(ret != GNUTLS_E_SUCCESS){
628
 
            fprintf_plus(stderr, "Error importing OpenPGP key : %s",
629
 
                         safer_gnutls_strerror(ret));
630
 
            privkey = NULL;
631
 
          }
632
 
          free(buffer.data);
633
 
          buffer.data = NULL;
634
 
          if(privkey != NULL){
635
 
            /* Use private key to suggest an appropriate sec_param */
636
 
            sec_param = gnutls_openpgp_privkey_sec_param(privkey);
637
 
            gnutls_openpgp_privkey_deinit(privkey);
638
 
            if(debug){
639
 
              fprintf_plus(stderr, "This OpenPGP key implies using a"
640
 
                           " GnuTLS security parameter \"%s\".\n",
641
 
                           safe_string(gnutls_sec_param_get_name
642
 
                                       (sec_param)));
643
 
            }
644
 
          }
645
 
        }
646
 
      }
647
 
      if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){
648
 
        /* Err on the side of caution */
649
 
        sec_param = GNUTLS_SEC_PARAM_ULTRA;
650
 
        if(debug){
651
 
          fprintf_plus(stderr, "Falling back to security parameter"
652
 
                       " \"%s\"\n",
653
 
                       safe_string(gnutls_sec_param_get_name
654
 
                                   (sec_param)));
655
 
        }
656
 
      }
657
 
    }
658
 
    uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
659
 
    if(uret != 0){
660
 
      mc->dh_bits = uret;
661
 
      if(debug){
662
 
        fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"
663
 
                     " implies %u DH bits; using that.\n",
664
 
                     safe_string(gnutls_sec_param_get_name
665
 
                                 (sec_param)),
666
 
                     mc->dh_bits);
667
 
      }
668
 
    } else {
669
 
      fprintf_plus(stderr, "Failed to get implied number of DH"
670
 
                   " bits for security parameter \"%s\"): %s\n",
671
 
                   safe_string(gnutls_sec_param_get_name(sec_param)),
672
 
                   safer_gnutls_strerror(ret));
673
 
      goto globalfail;
674
 
    }
675
 
  } else if(debug){
676
 
    fprintf_plus(stderr, "DH bits explicitly set to %u\n",
677
 
                 mc->dh_bits);
678
 
  }
679
562
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
680
563
  if(ret != GNUTLS_E_SUCCESS){
681
 
    fprintf_plus(stderr, "Error in GnuTLS prime generation (%u bits):"
682
 
                 " %s\n", mc->dh_bits, safer_gnutls_strerror(ret));
 
564
    fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",
 
565
                 safer_gnutls_strerror(ret));
683
566
    goto globalfail;
684
567
  }
685
568
  
1183
1066
     timed out */
1184
1067
  
1185
1068
  if(quit_now){
1186
 
    avahi_s_service_resolver_free(r);
1187
1069
    return;
1188
1070
  }
1189
1071
  
1757
1639
        _exit(EXIT_FAILURE);
1758
1640
      }
1759
1641
    } else {
1760
 
      if(hook_pid == -1){
1761
 
        perror_plus("fork");
1762
 
        free(direntry);
1763
 
        continue;
1764
 
      }
1765
1642
      int status;
1766
1643
      if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1767
1644
        perror_plus("waitpid");
1768
 
        free(direntry);
1769
1645
        continue;
1770
1646
      }
1771
1647
      if(WIFEXITED(status)){
1773
1649
          fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1774
1650
                       " with status %d\n", direntry->d_name,
1775
1651
                       WEXITSTATUS(status));
1776
 
          free(direntry);
1777
1652
          continue;
1778
1653
        }
1779
1654
      } else if(WIFSIGNALED(status)){
1780
1655
        fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1781
1656
                     " signal %d\n", direntry->d_name,
1782
1657
                     WTERMSIG(status));
1783
 
        free(direntry);
1784
1658
        continue;
1785
1659
      } else {
1786
1660
        fprintf_plus(stderr, "Warning: network hook \"%s\""
1787
1661
                     " crashed\n", direntry->d_name);
1788
 
        free(direntry);
1789
1662
        continue;
1790
1663
      }
1791
1664
    }
1793
1666
      fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1794
1667
                   direntry->d_name);
1795
1668
    }
1796
 
    free(direntry);
1797
1669
  }
1798
1670
  free(direntries);
1799
1671
  if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2007
1879
}
2008
1880
 
2009
1881
int main(int argc, char *argv[]){
2010
 
  mandos_context mc = { .server = NULL, .dh_bits = 0,
 
1882
  mandos_context mc = { .server = NULL, .dh_bits = 1024,
2011
1883
                        .priority = "SECURE256:!CTYPE-X.509:"
2012
 
                        "+CTYPE-OPENPGP:!RSA", .current_server = NULL,
 
1884
                        "+CTYPE-OPENPGP", .current_server = NULL,
2013
1885
                        .interfaces = NULL, .interfaces_size = 0 };
2014
1886
  AvahiSServiceBrowser *sb = NULL;
2015
1887
  error_t ret_errno;
2393
2265
        if(ret_errno != 0){
2394
2266
          errno = ret_errno;
2395
2267
          perror_plus("argz_add");
2396
 
          free(direntries[i]);
2397
2268
          continue;
2398
2269
        }
2399
2270
        if(debug){
2400
2271
          fprintf_plus(stderr, "Will use interface \"%s\"\n",
2401
2272
                       direntries[i]->d_name);
2402
2273
        }
2403
 
        free(direntries[i]);
2404
2274
      }
2405
2275
      free(direntries);
2406
2276
    } else {
2676
2546
    mc.current_server->prev->next = NULL;
2677
2547
    while(mc.current_server != NULL){
2678
2548
      server *next = mc.current_server->next;
2679
 
#ifdef __GNUC__
2680
 
#pragma GCC diagnostic push
2681
 
#pragma GCC diagnostic ignored "-Wcast-qual"
2682
 
#endif
2683
 
      free((char *)(mc.current_server->ip));
2684
 
#ifdef __GNUC__
2685
 
#pragma GCC diagnostic pop
2686
 
#endif
2687
2549
      free(mc.current_server);
2688
2550
      mc.current_server = next;
2689
2551
    }
2758
2620
                         " \"%s\", 0): %s\n", tempdir,
2759
2621
                         direntries[i]->d_name, strerror(errno));
2760
2622
          }
2761
 
          free(direntries[i]);
2762
2623
        }
2763
2624
        
2764
2625
        /* need to clean even if 0 because man page doesn't specify */