/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: 2015-07-07 15:49:49 UTC
  • Revision ID: teddy@recompile.se-20150707154949-vbuj4pc6wf3o1vgz
mandos.service: Use Type=dbus (implicitly).

mandos.service ([Service]/Type): Removed.
               ([Service]/BusName): Uncommented; set to
                                    "se.recompile.Mandos".

Show diffs side-by-side

added added

removed removed

Lines of Context:
516
516
__attribute__((nonnull, warn_unused_result))
517
517
static int init_gnutls_global(const char *pubkeyfilename,
518
518
                              const char *seckeyfilename,
519
 
                              const char *dhparamsfilename,
520
519
                              mandos_context *mc){
521
520
  int ret;
522
521
  unsigned int uret;
576
575
                 safer_gnutls_strerror(ret));
577
576
    goto globalfail;
578
577
  }
579
 
  /* If a Diffie-Hellman parameters file was given, try to use it */
580
 
  if(dhparamsfilename != NULL){
581
 
    gnutls_datum_t params = { .data = NULL, .size = 0 };
582
 
    do {
583
 
      int dhpfile = open(dhparamsfilename, O_RDONLY);
584
 
      if(dhpfile == -1){
585
 
        perror_plus("open");
586
 
        dhparamsfilename = NULL;
587
 
        break;
588
 
      }
589
 
      size_t params_capacity = 0;
 
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;
590
585
      while(true){
591
 
        params_capacity = incbuffer((char **)&params.data,
592
 
                                    (size_t)params.size,
593
 
                                    (size_t)params_capacity);
594
 
        if(params_capacity == 0){
 
586
        buffer_capacity = incbuffer((char **)&buffer.data,
 
587
                                    (size_t)buffer.size,
 
588
                                    (size_t)buffer_capacity);
 
589
        if(buffer_capacity == 0){
595
590
          perror_plus("incbuffer");
596
 
          free(params.data);
597
 
          params.data = NULL;
598
 
          dhparamsfilename = NULL;
 
591
          free(buffer.data);
 
592
          buffer.data = NULL;
599
593
          break;
600
594
        }
601
 
        ssize_t bytes_read = read(dhpfile,
602
 
                                  params.data + params.size,
 
595
        ssize_t bytes_read = read(secfile, buffer.data + buffer.size,
603
596
                                  BUFFER_SIZE);
604
597
        /* EOF */
605
598
        if(bytes_read == 0){
608
601
        /* check bytes_read for failure */
609
602
        if(bytes_read < 0){
610
603
          perror_plus("read");
611
 
          free(params.data);
612
 
          params.data = NULL;
613
 
          dhparamsfilename = NULL;
614
 
          break;
615
 
        }
616
 
        params.size += (unsigned int)bytes_read;
617
 
      }
618
 
      if(params.data == NULL){
619
 
        dhparamsfilename = NULL;
620
 
      }
621
 
      if(dhparamsfilename == NULL){
622
 
        break;
623
 
      }
624
 
      ret = gnutls_dh_params_import_pkcs3(mc->dh_params, &params,
625
 
                                          GNUTLS_X509_FMT_PEM);
626
 
      if(ret != GNUTLS_E_SUCCESS){
627
 
        fprintf_plus(stderr, "Failed to parse DH parameters in file"
628
 
                     " \"%s\": %s\n", dhparamsfilename,
629
 
                     safer_gnutls_strerror(ret));
630
 
        dhparamsfilename = NULL;
631
 
      }
632
 
    } while(false);
633
 
  }
634
 
  if(dhparamsfilename == NULL){
635
 
    if(mc->dh_bits == 0){
636
 
      /* Find out the optimal number of DH bits */
637
 
      /* Try to read the private key file */
638
 
      gnutls_datum_t buffer = { .data = NULL, .size = 0 };
639
 
      do {
640
 
        int secfile = open(seckeyfilename, O_RDONLY);
641
 
        if(secfile == -1){
642
 
          perror_plus("open");
643
 
          break;
644
 
        }
645
 
        size_t buffer_capacity = 0;
646
 
        while(true){
647
 
          buffer_capacity = incbuffer((char **)&buffer.data,
648
 
                                      (size_t)buffer.size,
649
 
                                      (size_t)buffer_capacity);
650
 
          if(buffer_capacity == 0){
651
 
            perror_plus("incbuffer");
652
 
            free(buffer.data);
653
 
            buffer.data = NULL;
654
 
            break;
655
 
          }
656
 
          ssize_t bytes_read = read(secfile,
657
 
                                    buffer.data + buffer.size,
658
 
                                    BUFFER_SIZE);
659
 
          /* EOF */
660
 
          if(bytes_read == 0){
661
 
            break;
662
 
          }
663
 
          /* check bytes_read for failure */
664
 
          if(bytes_read < 0){
665
 
            perror_plus("read");
666
 
            free(buffer.data);
667
 
            buffer.data = NULL;
668
 
            break;
669
 
          }
670
 
          buffer.size += (unsigned int)bytes_read;
671
 
        }
672
 
        close(secfile);
673
 
      } while(false);
674
 
      /* If successful, use buffer to parse private key */
675
 
      gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA;
676
 
      if(buffer.data != NULL){
677
 
        {
678
 
          gnutls_openpgp_privkey_t privkey = NULL;
679
 
          ret = gnutls_openpgp_privkey_init(&privkey);
 
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);
680
627
          if(ret != GNUTLS_E_SUCCESS){
681
 
            fprintf_plus(stderr, "Error initializing OpenPGP key"
682
 
                         " structure: %s",
 
628
            fprintf_plus(stderr, "Error importing OpenPGP key : %s",
683
629
                         safer_gnutls_strerror(ret));
684
 
            free(buffer.data);
685
 
            buffer.data = NULL;
686
 
          } else {
687
 
            ret = gnutls_openpgp_privkey_import
688
 
              (privkey, &buffer, GNUTLS_OPENPGP_FMT_BASE64, "", 0);
689
 
            if(ret != GNUTLS_E_SUCCESS){
690
 
              fprintf_plus(stderr, "Error importing OpenPGP key : %s",
691
 
                           safer_gnutls_strerror(ret));
692
 
              privkey = NULL;
693
 
            }
694
 
            free(buffer.data);
695
 
            buffer.data = NULL;
696
 
            if(privkey != NULL){
697
 
              /* Use private key to suggest an appropriate
698
 
                 sec_param */
699
 
              sec_param = gnutls_openpgp_privkey_sec_param(privkey);
700
 
              gnutls_openpgp_privkey_deinit(privkey);
701
 
              if(debug){
702
 
                fprintf_plus(stderr, "This OpenPGP key implies using"
703
 
                             " a GnuTLS security parameter \"%s\".\n",
704
 
                             safe_string(gnutls_sec_param_get_name
705
 
                                         (sec_param)));
706
 
              }
707
 
            }
 
630
            privkey = NULL;
708
631
          }
709
 
        }
710
 
        if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){
711
 
          /* Err on the side of caution */
712
 
          sec_param = GNUTLS_SEC_PARAM_ULTRA;
713
 
          if(debug){
714
 
            fprintf_plus(stderr, "Falling back to security parameter"
715
 
                         " \"%s\"\n",
716
 
                         safe_string(gnutls_sec_param_get_name
717
 
                                     (sec_param)));
 
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
            }
718
644
          }
719
645
        }
720
646
      }
721
 
      uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
722
 
      if(uret != 0){
723
 
        mc->dh_bits = uret;
 
647
      if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){
 
648
        /* Err on the side of caution */
 
649
        sec_param = GNUTLS_SEC_PARAM_ULTRA;
724
650
        if(debug){
725
 
          fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"
726
 
                       " implies %u DH bits; using that.\n",
 
651
          fprintf_plus(stderr, "Falling back to security parameter"
 
652
                       " \"%s\"\n",
727
653
                       safe_string(gnutls_sec_param_get_name
728
 
                                   (sec_param)),
729
 
                       mc->dh_bits);
 
654
                                   (sec_param)));
730
655
        }
731
 
      } else {
732
 
        fprintf_plus(stderr, "Failed to get implied number of DH"
733
 
                     " bits for security parameter \"%s\"): %s\n",
 
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",
734
664
                     safe_string(gnutls_sec_param_get_name
735
665
                                 (sec_param)),
736
 
                     safer_gnutls_strerror(ret));
737
 
        goto globalfail;
 
666
                     mc->dh_bits);
738
667
      }
739
 
    } else if(debug){
740
 
      fprintf_plus(stderr, "DH bits explicitly set to %u\n",
741
 
                   mc->dh_bits);
742
 
    }
743
 
    ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
744
 
    if(ret != GNUTLS_E_SUCCESS){
745
 
      fprintf_plus(stderr, "Error in GnuTLS prime generation (%u"
746
 
                   " bits): %s\n", mc->dh_bits,
 
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)),
747
672
                   safer_gnutls_strerror(ret));
748
673
      goto globalfail;
749
674
    }
750
 
  }
 
675
  } else if(debug){
 
676
    fprintf_plus(stderr, "DH bits explicitly set to %u\n",
 
677
                 mc->dh_bits);
 
678
  }
 
679
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
 
680
  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));
 
683
    goto globalfail;
 
684
  }
 
685
  
751
686
  gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
752
687
  
753
688
  return 0;
813
748
  /* ignore client certificate if any. */
814
749
  gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
815
750
  
 
751
  gnutls_dh_set_prime_bits(*session, mc->dh_bits);
 
752
  
816
753
  return 0;
817
754
}
818
755
 
2303
2240
  AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
2304
2241
  const char *seckey = PATHDIR "/" SECKEY;
2305
2242
  const char *pubkey = PATHDIR "/" PUBKEY;
2306
 
  const char *dh_params_file = NULL;
2307
2243
  char *interfaces_hooks = NULL;
2308
2244
  
2309
2245
  bool gnutls_initialized = false;
2362
2298
        .doc = "Bit length of the prime number used in the"
2363
2299
        " Diffie-Hellman key exchange",
2364
2300
        .group = 2 },
2365
 
      { .name = "dh-params", .key = 134,
2366
 
        .arg = "FILE",
2367
 
        .doc = "PEM-encoded PKCS#3 file with pre-generated parameters"
2368
 
        " for the Diffie-Hellman key exchange",
2369
 
        .group = 2 },
2370
2301
      { .name = "priority", .key = 130,
2371
2302
        .arg = "STRING",
2372
2303
        .doc = "GnuTLS priority string for the TLS handshake",
2427
2358
        }
2428
2359
        mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
2429
2360
        break;
2430
 
      case 134:                 /* --dh-params */
2431
 
        dh_params_file = arg;
2432
 
        break;
2433
2361
      case 130:                 /* --priority */
2434
2362
        mc.priority = arg;
2435
2363
        break;
2546
2474
        }
2547
2475
      }
2548
2476
      
2549
 
      if(strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
2550
 
        int dhparams_fd = open(dh_params_file, O_RDONLY);
2551
 
        if(dhparams_fd == -1){
2552
 
          perror_plus("open");
2553
 
        } else {
2554
 
          ret = (int)TEMP_FAILURE_RETRY(fstat(dhparams_fd, &st));
2555
 
          if(ret == -1){
2556
 
            perror_plus("fstat");
2557
 
          } else {
2558
 
            if(S_ISREG(st.st_mode)
2559
 
               and st.st_uid == 0 and st.st_gid == 0){
2560
 
              ret = fchown(dhparams_fd, uid, gid);
2561
 
              if(ret == -1){
2562
 
                perror_plus("fchown");
2563
 
              }
2564
 
            }
2565
 
          }
2566
 
          TEMP_FAILURE_RETRY(close(dhparams_fd));
2567
 
        }
2568
 
      }
2569
 
      
2570
2477
      /* Lower privileges */
2571
2478
      ret_errno = lower_privileges();
2572
2479
      if(ret_errno != 0){
2746
2653
      errno = bring_up_interface(interface, delay);
2747
2654
      if(not interface_was_up){
2748
2655
        if(errno != 0){
2749
 
          fprintf_plus(stderr, "Failed to bring up interface \"%s\":"
2750
 
                       " %s\n", interface, strerror(errno));
 
2656
          perror_plus("Failed to bring up interface");
2751
2657
        } else {
2752
2658
          errno = argz_add(&interfaces_to_take_down,
2753
2659
                           &interfaces_to_take_down_size,
2776
2682
    goto end;
2777
2683
  }
2778
2684
  
2779
 
  ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc);
 
2685
  ret = init_gnutls_global(pubkey, seckey, &mc);
2780
2686
  if(ret == -1){
2781
2687
    fprintf_plus(stderr, "init_gnutls_global failed\n");
2782
2688
    exitcode = EX_UNAVAILABLE;