/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: 2012-06-16 23:39:10 UTC
  • mto: (301.1.1 release) (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 302.
  • Revision ID: teddy@recompile.se-20120616233910-jxxxriq608qa6o8z
* plugins.d/mandos-client (mandos_context): New "interfaces" and
                                            "interfaces_size" members.
  (main): Removed "interfaces" and "interfaces_size" variabled; all
          users changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
161
161
  const char *priority;
162
162
  gpgme_ctx_t ctx;
163
163
  server *current_server;
 
164
  char *interfaces;
 
165
  size_t interfaces_size;
164
166
} mandos_context;
165
167
 
166
168
/* global so signal handler can reach it*/
167
169
AvahiSimplePoll *simple_poll;
168
 
mandos_context mc = { .server = NULL, .dh_bits = 1024,
169
 
                      .priority = "SECURE256:!CTYPE-X.509:"
170
 
                      "+CTYPE-OPENPGP", .current_server = NULL };
171
170
 
172
171
sig_atomic_t quit_now = 0;
173
172
int signal_received = 0;
210
209
 
211
210
/* Add server to set of servers to retry periodically */
212
211
bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index,
213
 
                int af){
 
212
                int af, server **current_server){
214
213
  int ret;
215
214
  server *new_server = malloc(sizeof(server));
216
215
  if(new_server == NULL){
226
225
    return false;
227
226
  }
228
227
  /* Special case of first server */
229
 
  if (mc.current_server == NULL){
 
228
  if(*current_server == NULL){
230
229
    new_server->next = new_server;
231
230
    new_server->prev = new_server;
232
 
    mc.current_server = new_server;
 
231
    *current_server = new_server;
233
232
  /* Place the new server last in the list */
234
233
  } else {
235
 
    new_server->next = mc.current_server;
236
 
    new_server->prev = mc.current_server->prev;
 
234
    new_server->next = *current_server;
 
235
    new_server->prev = (*current_server)->prev;
237
236
    new_server->prev->next = new_server;
238
 
    mc.current_server->prev = new_server;
 
237
    (*current_server)->prev = new_server;
239
238
  }
240
 
  ret = clock_gettime(CLOCK_MONOTONIC, &mc.current_server->last_seen);
 
239
  ret = clock_gettime(CLOCK_MONOTONIC, &(*current_server)->last_seen);
241
240
  if(ret == -1){
242
241
    perror_plus("clock_gettime");
243
242
    return false;
249
248
 * Initialize GPGME.
250
249
 */
251
250
static bool init_gpgme(const char *seckey, const char *pubkey,
252
 
                       const char *tempdir){
 
251
                       const char *tempdir, mandos_context *mc){
253
252
  gpgme_error_t rc;
254
253
  gpgme_engine_info_t engine_info;
255
254
  
274
273
      return false;
275
274
    }
276
275
    
277
 
    rc = gpgme_op_import(mc.ctx, pgp_data);
 
276
    rc = gpgme_op_import(mc->ctx, pgp_data);
278
277
    if(rc != GPG_ERR_NO_ERROR){
279
278
      fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n",
280
279
                   gpgme_strsource(rc), gpgme_strerror(rc));
324
323
  }
325
324
  
326
325
  /* Create new GPGME "context" */
327
 
  rc = gpgme_new(&(mc.ctx));
 
326
  rc = gpgme_new(&(mc->ctx));
328
327
  if(rc != GPG_ERR_NO_ERROR){
329
328
    fprintf_plus(stderr, "Mandos plugin mandos-client: "
330
329
                 "bad gpgme_new: %s: %s\n", gpgme_strsource(rc),
345
344
 */
346
345
static ssize_t pgp_packet_decrypt(const char *cryptotext,
347
346
                                  size_t crypto_size,
348
 
                                  char **plaintext){
 
347
                                  char **plaintext,
 
348
                                  mandos_context *mc){
349
349
  gpgme_data_t dh_crypto, dh_plain;
350
350
  gpgme_error_t rc;
351
351
  ssize_t ret;
377
377
  
378
378
  /* Decrypt data from the cryptotext data buffer to the plaintext
379
379
     data buffer */
380
 
  rc = gpgme_op_decrypt(mc.ctx, dh_crypto, dh_plain);
 
380
  rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain);
381
381
  if(rc != GPG_ERR_NO_ERROR){
382
382
    fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n",
383
383
                 gpgme_strsource(rc), gpgme_strerror(rc));
384
384
    plaintext_length = -1;
385
385
    if(debug){
386
386
      gpgme_decrypt_result_t result;
387
 
      result = gpgme_op_decrypt_result(mc.ctx);
 
387
      result = gpgme_op_decrypt_result(mc->ctx);
388
388
      if(result == NULL){
389
389
        fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
390
390
      } else {
481
481
}
482
482
 
483
483
static int init_gnutls_global(const char *pubkeyfilename,
484
 
                              const char *seckeyfilename){
 
484
                              const char *seckeyfilename,
 
485
                              mandos_context *mc){
485
486
  int ret;
486
487
  
487
488
  if(debug){
504
505
  }
505
506
  
506
507
  /* OpenPGP credentials */
507
 
  ret = gnutls_certificate_allocate_credentials(&mc.cred);
 
508
  ret = gnutls_certificate_allocate_credentials(&mc->cred);
508
509
  if(ret != GNUTLS_E_SUCCESS){
509
510
    fprintf_plus(stderr, "GnuTLS memory error: %s\n",
510
511
                 safer_gnutls_strerror(ret));
520
521
  }
521
522
  
522
523
  ret = gnutls_certificate_set_openpgp_key_file
523
 
    (mc.cred, pubkeyfilename, seckeyfilename,
 
524
    (mc->cred, pubkeyfilename, seckeyfilename,
524
525
     GNUTLS_OPENPGP_FMT_BASE64);
525
526
  if(ret != GNUTLS_E_SUCCESS){
526
527
    fprintf_plus(stderr,
532
533
  }
533
534
  
534
535
  /* GnuTLS server initialization */
535
 
  ret = gnutls_dh_params_init(&mc.dh_params);
 
536
  ret = gnutls_dh_params_init(&mc->dh_params);
536
537
  if(ret != GNUTLS_E_SUCCESS){
537
538
    fprintf_plus(stderr, "Error in GnuTLS DH parameter"
538
539
                 " initialization: %s\n",
539
540
                 safer_gnutls_strerror(ret));
540
541
    goto globalfail;
541
542
  }
542
 
  ret = gnutls_dh_params_generate2(mc.dh_params, mc.dh_bits);
 
543
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
543
544
  if(ret != GNUTLS_E_SUCCESS){
544
545
    fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",
545
546
                 safer_gnutls_strerror(ret));
546
547
    goto globalfail;
547
548
  }
548
549
  
549
 
  gnutls_certificate_set_dh_params(mc.cred, mc.dh_params);
 
550
  gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
550
551
  
551
552
  return 0;
552
553
  
553
554
 globalfail:
554
555
  
555
 
  gnutls_certificate_free_credentials(mc.cred);
 
556
  gnutls_certificate_free_credentials(mc->cred);
556
557
  gnutls_global_deinit();
557
 
  gnutls_dh_params_deinit(mc.dh_params);
 
558
  gnutls_dh_params_deinit(mc->dh_params);
558
559
  return -1;
559
560
}
560
561
 
561
 
static int init_gnutls_session(gnutls_session_t *session){
 
562
static int init_gnutls_session(gnutls_session_t *session,
 
563
                               mandos_context *mc){
562
564
  int ret;
563
565
  /* GnuTLS session creation */
564
566
  do {
576
578
  {
577
579
    const char *err;
578
580
    do {
579
 
      ret = gnutls_priority_set_direct(*session, mc.priority, &err);
 
581
      ret = gnutls_priority_set_direct(*session, mc->priority, &err);
580
582
      if(quit_now){
581
583
        gnutls_deinit(*session);
582
584
        return -1;
593
595
  
594
596
  do {
595
597
    ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
596
 
                                 mc.cred);
 
598
                                 mc->cred);
597
599
    if(quit_now){
598
600
      gnutls_deinit(*session);
599
601
      return -1;
609
611
  /* ignore client certificate if any. */
610
612
  gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
611
613
  
612
 
  gnutls_dh_set_prime_bits(*session, mc.dh_bits);
 
614
  gnutls_dh_set_prime_bits(*session, mc->dh_bits);
613
615
  
614
616
  return 0;
615
617
}
621
623
/* Called when a Mandos server is found */
622
624
static int start_mandos_communication(const char *ip, in_port_t port,
623
625
                                      AvahiIfIndex if_index,
624
 
                                      int af){
 
626
                                      int af, mandos_context *mc){
625
627
  int ret, tcp_sd = -1;
626
628
  ssize_t sret;
627
629
  union {
657
659
    return -1;
658
660
  }
659
661
  
660
 
  ret = init_gnutls_session(&session);
 
662
  ret = init_gnutls_session(&session, mc);
661
663
  if(ret != 0){
662
664
    return -1;
663
665
  }
935
937
  if(buffer_length > 0){
936
938
    ssize_t decrypted_buffer_size;
937
939
    decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length,
938
 
                                               &decrypted_buffer);
 
940
                                               &decrypted_buffer, mc);
939
941
    if(decrypted_buffer_size >= 0){
940
942
      
941
943
      written = 0;
1002
1004
                             AVAHI_GCC_UNUSED AvahiStringList *txt,
1003
1005
                             AVAHI_GCC_UNUSED AvahiLookupResultFlags
1004
1006
                             flags,
1005
 
                             AVAHI_GCC_UNUSED void* userdata){
 
1007
                             void* mc){
1006
1008
  if(r == NULL){
1007
1009
    return;
1008
1010
  }
1020
1022
    fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service "
1021
1023
                 "'%s' of type '%s' in domain '%s': %s\n", name, type,
1022
1024
                 domain,
1023
 
                 avahi_strerror(avahi_server_errno(mc.server)));
 
1025
                 avahi_strerror(avahi_server_errno
 
1026
                                (((mandos_context*)mc)->server)));
1024
1027
    break;
1025
1028
    
1026
1029
  case AVAHI_RESOLVER_FOUND:
1034
1037
      }
1035
1038
      int ret = start_mandos_communication(ip, (in_port_t)port,
1036
1039
                                           interface,
1037
 
                                           avahi_proto_to_af(proto));
 
1040
                                           avahi_proto_to_af(proto),
 
1041
                                           mc);
1038
1042
      if(ret == 0){
1039
1043
        avahi_simple_poll_quit(simple_poll);
1040
1044
      } else {
1041
1045
        if(not add_server(ip, (in_port_t)port, interface,
1042
 
                          avahi_proto_to_af(proto))){
 
1046
                          avahi_proto_to_af(proto),
 
1047
                          &((mandos_context*)mc)->current_server)){
1043
1048
          fprintf_plus(stderr, "Failed to add server \"%s\" to server"
1044
1049
                       " list\n", name);
1045
1050
        }
1058
1063
                            const char *domain,
1059
1064
                            AVAHI_GCC_UNUSED AvahiLookupResultFlags
1060
1065
                            flags,
1061
 
                            AVAHI_GCC_UNUSED void* userdata){
 
1066
                            void* mc){
1062
1067
  if(b == NULL){
1063
1068
    return;
1064
1069
  }
1075
1080
  case AVAHI_BROWSER_FAILURE:
1076
1081
    
1077
1082
    fprintf_plus(stderr, "(Avahi browser) %s\n",
1078
 
                 avahi_strerror(avahi_server_errno(mc.server)));
 
1083
                 avahi_strerror(avahi_server_errno
 
1084
                                (((mandos_context*)mc)->server)));
1079
1085
    avahi_simple_poll_quit(simple_poll);
1080
1086
    return;
1081
1087
    
1085
1091
       the callback function is called the Avahi server will free the
1086
1092
       resolver for us. */
1087
1093
    
1088
 
    if(avahi_s_service_resolver_new(mc.server, interface, protocol,
1089
 
                                    name, type, domain, protocol, 0,
1090
 
                                    resolve_callback, NULL) == NULL)
 
1094
    if(avahi_s_service_resolver_new(((mandos_context*)mc)->server,
 
1095
                                    interface, protocol, name, type,
 
1096
                                    domain, protocol, 0,
 
1097
                                    resolve_callback, mc) == NULL)
1091
1098
      fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':"
1092
1099
                   " %s\n", name,
1093
 
                   avahi_strerror(avahi_server_errno(mc.server)));
 
1100
                   avahi_strerror(avahi_server_errno
 
1101
                                  (((mandos_context*)mc)->server)));
1094
1102
    break;
1095
1103
    
1096
1104
  case AVAHI_BROWSER_REMOVE:
1316
1324
  return 1;
1317
1325
}
1318
1326
 
1319
 
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval){
 
1327
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,
 
1328
                            mandos_context *mc){
1320
1329
  int ret;
1321
1330
  struct timespec now;
1322
1331
  struct timespec waited_time;
1323
1332
  intmax_t block_time;
1324
1333
  
1325
1334
  while(true){
1326
 
    if(mc.current_server == NULL){
 
1335
    if(mc->current_server == NULL){
1327
1336
      if (debug){
1328
1337
        fprintf_plus(stderr, "Wait until first server is found."
1329
1338
                     " No timeout!\n");
1343
1352
      /* Calculating in ms how long time between now and server
1344
1353
         who we visted longest time ago. Now - last seen.  */
1345
1354
      waited_time.tv_sec = (now.tv_sec
1346
 
                            - mc.current_server->last_seen.tv_sec);
 
1355
                            - mc->current_server->last_seen.tv_sec);
1347
1356
      waited_time.tv_nsec = (now.tv_nsec
1348
 
                             - mc.current_server->last_seen.tv_nsec);
 
1357
                             - mc->current_server->last_seen.tv_nsec);
1349
1358
      /* total time is 10s/10,000ms.
1350
1359
         Converting to s from ms by dividing by 1,000,
1351
1360
         and ns to ms by dividing by 1,000,000. */
1359
1368
      }
1360
1369
      
1361
1370
      if(block_time <= 0){
1362
 
        ret = start_mandos_communication(mc.current_server->ip,
1363
 
                                         mc.current_server->port,
1364
 
                                         mc.current_server->if_index,
1365
 
                                         mc.current_server->af);
 
1371
        ret = start_mandos_communication(mc->current_server->ip,
 
1372
                                         mc->current_server->port,
 
1373
                                         mc->current_server->if_index,
 
1374
                                         mc->current_server->af, mc);
1366
1375
        if(ret == 0){
1367
 
          avahi_simple_poll_quit(simple_poll);
 
1376
          avahi_simple_poll_quit(s);
1368
1377
          return 0;
1369
1378
        }
1370
1379
        ret = clock_gettime(CLOCK_MONOTONIC,
1371
 
                            &mc.current_server->last_seen);
 
1380
                            &mc->current_server->last_seen);
1372
1381
        if(ret == -1){
1373
1382
          perror_plus("clock_gettime");
1374
1383
          return -1;
1375
1384
        }
1376
 
        mc.current_server = mc.current_server->next;
 
1385
        mc->current_server = mc->current_server->next;
1377
1386
        block_time = 0;         /* Call avahi to find new Mandos
1378
1387
                                   servers, but don't block */
1379
1388
      }
1746
1755
}
1747
1756
 
1748
1757
int main(int argc, char *argv[]){
 
1758
  mandos_context mc = { .server = NULL, .dh_bits = 1024,
 
1759
                        .priority = "SECURE256:!CTYPE-X.509:"
 
1760
                        "+CTYPE-OPENPGP", .current_server = NULL, 
 
1761
                        .interfaces = NULL, .interfaces_size = 0 };
1749
1762
  AvahiSServiceBrowser *sb = NULL;
1750
1763
  error_t ret_errno;
1751
1764
  int ret;
1752
1765
  intmax_t tmpmax;
1753
1766
  char *tmp;
1754
1767
  int exitcode = EXIT_SUCCESS;
1755
 
  char *interfaces = NULL;
1756
 
  size_t interfaces_size = 0;
1757
1768
  char *interfaces_to_take_down = NULL;
1758
1769
  size_t interfaces_to_take_down_size = 0;
1759
1770
  char tempdir[] = "/tmp/mandosXXXXXX";
1859
1870
        connect_to = arg;
1860
1871
        break;
1861
1872
      case 'i':                 /* --interface */
1862
 
        ret_errno = argz_add_sep(&interfaces, &interfaces_size, arg,
1863
 
                                 (int)',');
 
1873
        ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size,
 
1874
                                 arg, (int)',');
1864
1875
        if(ret_errno != 0){
1865
1876
          argp_error(state, "%s", strerror(ret_errno));
1866
1877
        }
2004
2015
  /* Remove empty interface names */
2005
2016
  {
2006
2017
    char *interface = NULL;
2007
 
    while((interface = argz_next(interfaces, interfaces_size,
 
2018
    while((interface = argz_next(mc.interfaces, mc.interfaces_size,
2008
2019
                                 interface))){
2009
2020
      if(if_nametoindex(interface) == 0){
2010
2021
        if(interface[0] != '\0' and strcmp(interface, "none") != 0){
2011
2022
          fprintf_plus(stderr, "Not using nonexisting interface"
2012
2023
                       " \"%s\"\n", interface);
2013
2024
        }
2014
 
        argz_delete(&interfaces, &interfaces_size, interface);
 
2025
        argz_delete(&mc.interfaces, &mc.interfaces_size, interface);
2015
2026
        interface = NULL;
2016
2027
      }
2017
2028
    }
2020
2031
  /* Run network hooks */
2021
2032
  {
2022
2033
    
2023
 
    if(interfaces != NULL){
2024
 
      interfaces_hooks = malloc(interfaces_size);
 
2034
    if(mc.interfaces != NULL){
 
2035
      interfaces_hooks = malloc(mc.interfaces_size);
2025
2036
      if(interfaces_hooks == NULL){
2026
2037
        perror_plus("malloc");
2027
2038
        goto end;
2028
2039
      }
2029
 
      memcpy(interfaces_hooks, interfaces, interfaces_size);
2030
 
      interfaces_hooks_size = interfaces_size;
 
2040
      memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);
 
2041
      interfaces_hooks_size = mc.interfaces_size;
2031
2042
      argz_stringify(interfaces_hooks, interfaces_hooks_size,
2032
2043
                     (int)',');
2033
2044
    }
2117
2128
  }
2118
2129
  
2119
2130
  /* If no interfaces were specified, make a list */
2120
 
  if(interfaces == NULL){
 
2131
  if(mc.interfaces == NULL){
2121
2132
    struct dirent **direntries;
2122
2133
    /* Look for any good interfaces */
2123
2134
    ret = scandir(sys_class_net, &direntries, good_interface,
2125
2136
    if(ret >= 1){
2126
2137
      /* Add all found interfaces to interfaces list */
2127
2138
      for(int i = 0; i < ret; ++i){
2128
 
        ret_errno = argz_add(&interfaces, &interfaces_size,
 
2139
        ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size,
2129
2140
                             direntries[i]->d_name);
2130
2141
        if(ret_errno != 0){
2131
2142
          perror_plus("argz_add");
2146
2157
  }
2147
2158
  
2148
2159
  /* If we only got one interface, explicitly use only that one */
2149
 
  if(argz_count(interfaces, interfaces_size) == 1){
 
2160
  if(argz_count(mc.interfaces, mc.interfaces_size) == 1){
2150
2161
    if(debug){
2151
2162
      fprintf_plus(stderr, "Using only interface \"%s\"\n",
2152
 
                   interfaces);
 
2163
                   mc.interfaces);
2153
2164
    }
2154
 
    if_index = (AvahiIfIndex)if_nametoindex(interfaces);
 
2165
    if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces);
2155
2166
  }
2156
2167
  
2157
2168
  /* Bring up interfaces which are down */
2158
 
  if(not (argz_count(interfaces, interfaces_size) == 1
2159
 
          and strcmp(interfaces, "none") == 0)){
 
2169
  if(not (argz_count(mc.interfaces, mc.interfaces_size) == 1
 
2170
          and strcmp(mc.interfaces, "none") == 0)){
2160
2171
    char *interface = NULL;
2161
 
    while((interface = argz_next(interfaces, interfaces_size,
 
2172
    while((interface = argz_next(mc.interfaces, mc.interfaces_size,
2162
2173
                                 interface))){
2163
2174
      bool interface_was_up = interface_is_up(interface);
2164
2175
      ret = bring_up_interface(interface, delay);
2173
2184
        }
2174
2185
      }
2175
2186
    }
2176
 
    free(interfaces);
2177
 
    interfaces = NULL;
2178
 
    interfaces_size = 0;
 
2187
    free(mc.interfaces);
 
2188
    mc.interfaces = NULL;
 
2189
    mc.interfaces_size = 0;
2179
2190
    if(debug and (interfaces_to_take_down == NULL)){
2180
2191
      fprintf_plus(stderr, "No interfaces were brought up\n");
2181
2192
    }
2185
2196
    goto end;
2186
2197
  }
2187
2198
  
2188
 
  ret = init_gnutls_global(pubkey, seckey);
 
2199
  ret = init_gnutls_global(pubkey, seckey, &mc);
2189
2200
  if(ret == -1){
2190
2201
    fprintf_plus(stderr, "init_gnutls_global failed\n");
2191
2202
    exitcode = EX_UNAVAILABLE;
2208
2219
    goto end;
2209
2220
  }
2210
2221
  
2211
 
  if(not init_gpgme(pubkey, seckey, tempdir)){
 
2222
  if(not init_gpgme(pubkey, seckey, tempdir, &mc)){
2212
2223
    fprintf_plus(stderr, "init_gpgme failed\n");
2213
2224
    exitcode = EX_UNAVAILABLE;
2214
2225
    goto end;
2271
2282
    }
2272
2283
    
2273
2284
    while(not quit_now){
2274
 
      ret = start_mandos_communication(address, port, if_index, af);
 
2285
      ret = start_mandos_communication(address, port, if_index, af,
 
2286
                                       &mc);
2275
2287
      if(quit_now or ret == 0){
2276
2288
        break;
2277
2289
      }
2325
2337
  /* Create the Avahi service browser */
2326
2338
  sb = avahi_s_service_browser_new(mc.server, if_index,
2327
2339
                                   AVAHI_PROTO_UNSPEC, "_mandos._tcp",
2328
 
                                   NULL, 0, browse_callback, NULL);
 
2340
                                   NULL, 0, browse_callback,
 
2341
                                   (void *)&mc);
2329
2342
  if(sb == NULL){
2330
2343
    fprintf_plus(stderr, "Failed to create service browser: %s\n",
2331
2344
                 avahi_strerror(avahi_server_errno(mc.server)));
2344
2357
  }
2345
2358
 
2346
2359
  ret = avahi_loop_with_timeout(simple_poll,
2347
 
                                (int)(retry_interval * 1000));
 
2360
                                (int)(retry_interval * 1000), &mc);
2348
2361
  if(debug){
2349
2362
    fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n",
2350
2363
                 (ret == 0) ? "successfully" : "with error");