/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-22 02:19:30 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140622021930-icl7h4cm97blhjml
mandos-keygen: Generate "checker" option to use SSH fingerprints.

To turn this off, use a new "--no-ssh" option to mandos-keygen.

* INSTALL (Mandos Server, Mandos Client): Document new suggested
                                          installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
                                   "mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
  (mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
                                          called "Faking ping
                                          replies?" to address new
                                          default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
                                             behavior of
                                             mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
                 "sec*", since no such files may exist.
 (password mode): Scan for SSH key fingerprints and output as new
                  "checker" and "ssh_fingerprint" options, unless new
                  "--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
  (OPTIONS/--no-ssh): New.
  (SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
                                          possibility of using SSH key
                                          fingerprints for checking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
1458
1458
  error_t ret_errno = 0;
1459
1459
  if(seteuid(0) == -1){
1460
1460
    ret_errno = errno;
1461
 
    perror_plus("seteuid");
1462
1461
  }
1463
1462
  errno = old_errno;
1464
1463
  return ret_errno;
1475
1474
  }
1476
1475
  if(setuid(0) == -1){
1477
1476
    ret_errno = errno;
1478
 
    perror_plus("seteuid");
1479
1477
  }
1480
1478
  errno = old_errno;
1481
1479
  return ret_errno;
1488
1486
  error_t ret_errno = 0;
1489
1487
  if(seteuid(uid) == -1){
1490
1488
    ret_errno = errno;
1491
 
    perror_plus("seteuid");
1492
1489
  }
1493
1490
  errno = old_errno;
1494
1491
  return ret_errno;
1501
1498
  error_t ret_errno = 0;
1502
1499
  if(setuid(uid) == -1){
1503
1500
    ret_errno = errno;
1504
 
    perror_plus("setuid");
1505
1501
  }
1506
1502
  errno = old_errno;
1507
1503
  return ret_errno;
1510
1506
__attribute__((nonnull))
1511
1507
void run_network_hooks(const char *mode, const char *interface,
1512
1508
                       const float delay){
1513
 
  struct dirent **direntries;
 
1509
  struct dirent **direntries = NULL;
1514
1510
  if(hookdir_fd == -1){
1515
1511
    hookdir_fd = open(hookdir, O_RDONLY);
1516
1512
    if(hookdir_fd == -1){
1554
1550
    if(hook_pid == 0){
1555
1551
      /* Child */
1556
1552
      /* Raise privileges */
1557
 
      if(raise_privileges_permanently() != 0){
 
1553
      errno = raise_privileges_permanently();
 
1554
      if(errno != 0){
1558
1555
        perror_plus("Failed to raise privileges");
1559
1556
        _exit(EX_NOPERM);
1560
1557
      }
1670
1667
                   direntry->d_name);
1671
1668
    }
1672
1669
  }
 
1670
  free(direntries);
1673
1671
  if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1674
1672
    perror_plus("close");
1675
1673
  } else {
1732
1730
    /* Raise privileges */
1733
1731
    ret_errno = raise_privileges();
1734
1732
    if(ret_errno != 0){
 
1733
      errno = ret_errno;
1735
1734
      perror_plus("Failed to raise privileges");
1736
1735
    }
1737
1736
    
1841
1840
    /* Raise privileges */
1842
1841
    ret_errno = raise_privileges();
1843
1842
    if(ret_errno != 0){
 
1843
      errno = ret_errno;
1844
1844
      perror_plus("Failed to raise privileges");
1845
1845
    }
1846
1846
    
2274
2274
      }
2275
2275
      free(direntries);
2276
2276
    } else {
2277
 
      free(direntries);
 
2277
      if(ret == 0){
 
2278
        free(direntries);
 
2279
      }
2278
2280
      fprintf_plus(stderr, "Could not find a network interface\n");
2279
2281
      exitcode = EXIT_FAILURE;
2280
2282
      goto end;
2553
2555
  {
2554
2556
    ret_errno = raise_privileges();
2555
2557
    if(ret_errno != 0){
 
2558
      errno = ret_errno;
2556
2559
      perror_plus("Failed to raise privileges");
2557
2560
    } else {
2558
2561
      
2581
2584
    
2582
2585
    ret_errno = lower_privileges_permanently();
2583
2586
    if(ret_errno != 0){
 
2587
      errno = ret_errno;
2584
2588
      perror_plus("Failed to lower privileges permanently");
2585
2589
    }
2586
2590
  }
2608
2612
      int numentries = scandir(tempdir, &direntries, notdotentries,
2609
2613
                               alphasort);
2610
2614
#endif  /* not __GLIBC__ */
2611
 
      if(numentries > 0){
 
2615
      if(numentries >= 0){
2612
2616
        for(int i = 0; i < numentries; i++){
2613
2617
          ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
2614
2618
          if(ret == -1){