To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to dracut-module/password-agent.c
- browse files at revision 1206
- compare with another revision
- download diff
- download tarball
- view history from revision 1206
- Committer: teddy at recompile
- Date: 2020-02-09 03:42:50 UTC
- Revision ID: teddy@recompile.se-20200209034250-dxkkuq0eevnzk8py
Update formatting in TODO file
* TODO: Add markup, links and a file-wide tag.
* TODO: Add markup, links and a file-wide tag.
- files removed:
- debian/po/es.po
- files modified:
- DBUS-API
added
removed
dracut-module/password-agent.c
1
/* -*- coding: utf-8; lexical-binding: t -*- */
1
/* -*- mode: c; coding: utf-8; after-save-hook: (lambda () (let* ((find-build-directory (lambda (try-directory &optional base-directory) (let ((base-directory (or base-directory try-directory))) (cond ((equal try-directory "/") base-directory) ((file-readable-p (concat (file-name-as-directory try-directory) "Makefile")) try-directory) ((funcall find-build-directory (directory-file-name (file-name-directory try-directory)) base-directory)))))) (build-directory (funcall find-build-directory (buffer-file-name))) (local-build-directory (if (fboundp 'file-local-name) (file-local-name build-directory) (or (file-remote-p build-directory 'localname) build-directory))) (command (file-relative-name (file-name-sans-extension (buffer-file-name)) build-directory))) (pcase (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (let ((qbdir (shell-quote-argument local-build-directory)) (qcmd (shell-quote-argument command))) (format "cd %s && CFLAGS=-Werror make --silent %s && %s --test --verbose" qbdir qcmd qcmd)) nil "*Test*")) (0 (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w)))) (_ (with-current-buffer "*Test*" (compilation-mode) (cd-absolute build-directory)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); -*- */
2
2
/*
3
3
* Mandos password agent - Simple password agent to run Mandos client
4
4
*
5
* Copyright © 2019-2022 Teddy Hogeborn
6
* Copyright © 2019-2022 Björn Påhlsson
5
* Copyright © 2019 Teddy Hogeborn
6
* Copyright © 2019 Björn Påhlsson
7
7
*
8
8
* This file is part of Mandos.
9
9
*
23
23
* Contact the authors at <mandos@recompile.se>.
24
24
*/
25
25
26
#define _GNU_SOURCE /* pipe2(), O_CLOEXEC, setresgid(),
27
setresuid(), asprintf(), getline(),
28
basename() */
29
#include <inttypes.h> /* uintmax_t, strtoumax(), PRIuMAX,
30
PRIdMAX, intmax_t, uint32_t,
31
SCNx32, SCNuMAX, SCNxMAX */
32
#include <stddef.h> /* size_t, NULL */
26
#define _GNU_SOURCE
27
#include <inttypes.h> /* uintmax_t, PRIuMAX, PRIdMAX,
28
intmax_t, uint32_t, SCNx32,
29
SCNuMAX, SCNxMAX */
30
#include <stddef.h> /* size_t */
33
31
#include <sys/types.h> /* pid_t, uid_t, gid_t, getuid(),
34
32
getpid() */
35
33
#include <stdbool.h> /* bool, true, false */
42
40
NSIG, sigismember(), SA_ONSTACK,
43
41
SIG_DFL, SIG_IGN, SIGINT, SIGQUIT,
44
42
SIGHUP, SIGSTOP, SIG_UNBLOCK */
45
#include <unistd.h> /* uid_t, gid_t, close(), pipe2(),
46
fork(), _exit(), dup2(),
47
STDOUT_FILENO, setresgid(),
48
setresuid(), execv(), ssize_t,
49
read(), dup3(), getuid(), dup(),
50
STDERR_FILENO, pause(), write(),
51
rmdir(), unlink(), getpid() */
52
43
#include <stdlib.h> /* EXIT_SUCCESS, EXIT_FAILURE,
53
malloc(), free(), realloc(),
54
setenv(), calloc(), mkdtemp(),
55
mkostemp() */
44
malloc(), free(), strtoumax(),
45
realloc(), setenv(), calloc(),
46
mkdtemp(), mkostemp() */
56
47
#include <iso646.h> /* not, or, and, xor */
57
48
#include <error.h> /* error() */
58
49
#include <sysexits.h> /* EX_USAGE, EX_OSERR, EX_OSFILE */
66
57
#include <string.h> /* strdup(), memcpy(),
67
58
explicit_bzero(), memset(),
68
59
strcmp(), strlen(), strncpy(),
69
memcmp(), basename(), strerror() */
60
memcmp(), basename() */
70
61
#include <argz.h> /* argz_create(), argz_count(),
71
62
argz_extract(), argz_next(),
72
63
argz_add() */
82
73
ARGP_ERR_UNKNOWN, ARGP_KEY_ARGS,
83
74
struct argp, argp_parse(),
84
75
ARGP_NO_EXIT */
85
#include <stdint.h> /* SIZE_MAX, uint32_t */
76
#include <stdint.h> /* SIZE_MAX */
77
#include <unistd.h> /* uid_t, gid_t, close(), pipe2(),
78
fork(), _exit(), dup2(),
79
STDOUT_FILENO, setresgid(),
80
setresuid(), execv(), ssize_t,
81
read(), dup3(), getuid(), dup(),
82
STDERR_FILENO, pause(), write(),
83
rmdir(), unlink(), getpid() */
86
84
#include <sys/mman.h> /* munlock(), mlock() */
87
85
#include <fcntl.h> /* O_CLOEXEC, O_NONBLOCK, fcntl(),
88
86
F_GETFD, F_GETFL, FD_CLOEXEC,
112
110
g_assert_null(), g_assert_false(),
113
111
g_assert_cmpint(), g_assert_cmpuint(),
114
112
g_test_skip(), g_assert_cmpstr(),
115
g_test_message(), g_test_init(), g_test_add(),
116
g_test_run(), GOptionContext,
117
g_option_context_new(),
113
g_test_init(), g_test_add(), g_test_run(),
114
GOptionContext, g_option_context_new(),
118
115
g_option_context_set_help_enabled(), FALSE,
119
116
g_option_context_set_ignore_unknown_options(),
120
117
gboolean, GOptionEntry, G_OPTION_ARG_NONE,
871
868
}
872
869
close(pipefds[1]);
873
870
874
if(pid == -1){
875
error(0, errno, "Failed to fork()");
876
close(pipefds[0]);
877
return false;
878
}
879
880
871
if(not add_to_queue(queue, (task_context){
881
872
.func=wait_for_mandos_client_exit,
882
873
.pid=pid,
1098
1089
} ievent_buffer;
1099
1090
struct inotify_event *const ievent = &ievent_buffer.event;
1100
1091
1101
#if defined(__GNUC__) and __GNUC__ >= 7
1102
#pragma GCC diagnostic push
1103
/* ievent is pointing into a struct which is of sufficient size */
1104
#pragma GCC diagnostic ignored "-Wstringop-overflow"
1105
#endif
1106
1092
const ssize_t read_length = read(fd, ievent, ievent_size);
1107
#if defined(__GNUC__) and __GNUC__ >= 7
1108
#pragma GCC diagnostic pop
1109
#endif
1110
1093
if(read_length == 0){ /* EOF */
1111
1094
error(0, 0, "Got EOF from inotify fd for directory %s", filename);
1112
1095
*quit_now = true;
1204
1187
bool *const password_is_read = task.password_is_read;
1205
1188
1206
1189
/* We use the GLib "Key-value file parser" functions to parse the
1207
question file. See <https://systemd.io/PASSWORD_AGENTS/> for
1208
specification of contents */
1190
question file. See <https://www.freedesktop.org/wiki/Software
1191
/systemd/PasswordAgents/> for specification of contents */
1209
1192
__attribute__((nonnull))
1210
1193
void cleanup_g_key_file(GKeyFile **key_file){
1211
1194
if(*key_file != NULL){
1501
1484
not. You may but don't have to include a final NUL byte in
1502
1485
your message.
1503
1486
1504
— <https://systemd.io/PASSWORD_AGENTS/> (Tue, 15 Sep 2020
1505
14:24:20 GMT)
1487
— <https://www.freedesktop.org/wiki/Software/systemd/
1488
PasswordAgents/> (Wed 08 Oct 2014 02:14:28 AM UTC)
1506
1489
*/
1507
1490
send_buffer[0] = '+'; /* Prefix with "+" */
1508
1491
/* Always add an extra NUL */
1513
1496
errno = 0;
1514
1497
ssize_t ssret = send(fd, send_buffer, send_buffer_length,
1515
1498
MSG_NOSIGNAL);
1516
const error_t saved_errno = (ssret < 0) ? errno : 0;
1499
const error_t saved_errno = errno;
1517
1500
#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 25)
1518
1501
explicit_bzero(send_buffer, send_buffer_length);
1519
1502
#else
1537
1520
/* Retry, below */
1538
1521
break;
1539
1522
case EMSGSIZE:
1540
error(0, saved_errno, "Password of size %" PRIuMAX
1541
" is too big", (uintmax_t)password->length);
1523
error(0, 0, "Password of size %" PRIuMAX " is too big",
1524
(uintmax_t)password->length);
1542
1525
#if __GNUC__ < 7
1543
1526
/* FALLTHROUGH */
1544
1527
#else
1546
1529
#endif
1547
1530
case 0:
1548
1531
if(ssret >= 0 and ssret < (ssize_t)send_buffer_length){
1549
error(0, 0, "Password only partially sent to socket %s: %"
1550
PRIuMAX " out of %" PRIuMAX " bytes sent", filename,
1551
(uintmax_t)ssret, (uintmax_t)send_buffer_length);
1532
error(0, 0, "Password only partially sent to socket");
1552
1533
}
1553
1534
#if __GNUC__ < 7
1554
1535
/* FALLTHROUGH */
2209
2190
}
2210
2191
exit(EXIT_SUCCESS);
2211
2192
}
2212
if(pid == -1){
2213
error(EXIT_FAILURE, errno, "Failed to fork()");
2214
}
2215
2216
2193
int status;
2217
2194
waitpid(pid, &status, 0);
2218
2195
if(WIFEXITED(status) and (WEXITSTATUS(status) == EXIT_SUCCESS)){
4190
4167
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4191
4168
const size_t ievent_size = (sizeof(struct inotify_event)
4192
4169
+ sizeof(dummy_file_name));
4193
#if defined(__GNUC__) and __GNUC__ >= 11
4194
#pragma GCC diagnostic push
4195
/* ievent is pointing into a struct which is of sufficient size */
4196
#pragma GCC diagnostic ignored "-Wstringop-overread"
4197
#endif
4198
4170
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4199
4171
==, ievent_size);
4200
#if defined(__GNUC__) and __GNUC__ >= 11
4201
#pragma GCC diagnostic pop
4202
#endif
4203
4172
g_assert_cmpint(close(pipefds[1]), ==, 0);
4204
4173
4205
4174
bool quit_now = false;
4293
4262
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4294
4263
const size_t ievent_size = (sizeof(struct inotify_event)
4295
4264
+ sizeof(dummy_file_name));
4296
#if defined(__GNUC__) and __GNUC__ >= 11
4297
#pragma GCC diagnostic push
4298
/* ievent is pointing into a struct which is of sufficient size */
4299
#pragma GCC diagnostic ignored "-Wstringop-overread"
4300
#endif
4301
4265
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4302
4266
==, ievent_size);
4303
#if defined(__GNUC__) and __GNUC__ >= 11
4304
#pragma GCC diagnostic pop
4305
#endif
4306
4267
g_assert_cmpint(close(pipefds[1]), ==, 0);
4307
4268
4308
4269
bool quit_now = false;
4398
4359
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4399
4360
const size_t ievent_size = (sizeof(struct inotify_event)
4400
4361
+ sizeof(dummy_file_name));
4401
#if defined(__GNUC__) and __GNUC__ >= 11
4402
#pragma GCC diagnostic push
4403
/* ievent is pointing into a struct which is of sufficient size */
4404
#pragma GCC diagnostic ignored "-Wstringop-overread"
4405
#endif
4406
4362
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4407
4363
==, ievent_size);
4408
#if defined(__GNUC__) and __GNUC__ >= 11
4409
#pragma GCC diagnostic pop
4410
#endif
4411
4364
g_assert_cmpint(close(pipefds[1]), ==, 0);
4412
4365
4413
4366
bool quit_now = false;
4491
4444
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4492
4445
const size_t ievent_size = (sizeof(struct inotify_event)
4493
4446
+ sizeof(dummy_file_name));
4494
#if defined(__GNUC__) and __GNUC__ >= 11
4495
#pragma GCC diagnostic push
4496
/* ievent is pointing into a struct which is of sufficient size */
4497
#pragma GCC diagnostic ignored "-Wstringop-overread"
4498
#endif
4499
4447
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4500
4448
==, ievent_size);
4501
#if defined(__GNUC__) and __GNUC__ >= 11
4502
#pragma GCC diagnostic pop
4503
#endif
4504
4449
g_assert_cmpint(close(pipefds[1]), ==, 0);
4505
4450
4506
4451
bool quit_now = false;
4583
4528
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4584
4529
const size_t ievent_size = (sizeof(struct inotify_event)
4585
4530
+ sizeof(dummy_file_name));
4586
#if defined(__GNUC__) and __GNUC__ >= 11
4587
#pragma GCC diagnostic push
4588
/* ievent is pointing into a struct which is of sufficient size */
4589
#pragma GCC diagnostic ignored "-Wstringop-overread"
4590
#endif
4591
4531
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4592
4532
==, ievent_size);
4593
#if defined(__GNUC__) and __GNUC__ >= 11
4594
#pragma GCC diagnostic pop
4595
#endif
4596
4533
g_assert_cmpint(close(pipefds[1]), ==, 0);
4597
4534
4598
4535
bool quit_now = false;
4667
4604
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4668
4605
const size_t ievent_size = (sizeof(struct inotify_event)
4669
4606
+ sizeof(dummy_file_name));
4670
#if defined(__GNUC__) and __GNUC__ >= 11
4671
#pragma GCC diagnostic push
4672
/* ievent is pointing into a struct which is of sufficient size */
4673
#pragma GCC diagnostic ignored "-Wstringop-overread"
4674
#endif
4675
4607
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4676
4608
==, ievent_size);
4677
#if defined(__GNUC__) and __GNUC__ >= 11
4678
#pragma GCC diagnostic pop
4679
#endif
4680
4609
g_assert_cmpint(close(pipefds[1]), ==, 0);
4681
4610
4682
4611
bool quit_now = false;
4754
4683
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4755
4684
const size_t ievent_size = (sizeof(struct inotify_event)
4756
4685
+ sizeof(dummy_file_name));
4757
#if defined(__GNUC__) and __GNUC__ >= 11
4758
#pragma GCC diagnostic push
4759
/* ievent is pointing into a struct which is of sufficient size */
4760
#pragma GCC diagnostic ignored "-Wstringop-overread"
4761
#endif
4762
4686
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4763
4687
==, ievent_size);
4764
#if defined(__GNUC__) and __GNUC__ >= 11
4765
#pragma GCC diagnostic pop
4766
#endif
4767
4688
g_assert_cmpint(close(pipefds[1]), ==, 0);
4768
4689
4769
4690
bool quit_now = false;
5876
5797
char write_data[PIPE_BUF];
5877
5798
{
5878
5799
/* Construct test password buffer */
5879
/* Start with + since that is what the real protocol uses */
5800
/* Start with + since that is what the real procotol uses */
5880
5801
write_data[0] = '+';
5881
5802
/* Set a special character at string end just to mark the end */
5882
5803
write_data[sizeof(write_data)-2] = 'y';
6034
5955
char *const filename = strdup("/nonexistent/socket");
6035
5956
__attribute__((cleanup(string_set_clear)))
6036
5957
string_set cancelled_filenames = {};
6037
int socketfds[2];
6038
6039
/* Find a message size which triggers EMSGSIZE */
6040
__attribute__((cleanup(cleanup_string)))
6041
char *message_buffer = NULL;
6042
size_t message_size = PIPE_BUF + 1;
6043
for(ssize_t ssret = 0; ssret >= 0; message_size += 1024){
6044
if(message_size >= 1024*1024*1024){ /* 1 GiB */
6045
g_test_skip("Skipping EMSGSIZE test: Will not try 1GiB");
6046
return;
6047
}
6048
message_buffer = realloc(message_buffer, message_size);
6049
if(message_buffer == NULL){
6050
g_test_skip("Skipping EMSGSIZE test");
6051
g_test_message("Failed to malloc() %" PRIuMAX " bytes",
6052
(uintmax_t)message_size);
6053
return;
6054
}
6055
/* Fill buffer with 'x' */
6056
memset(message_buffer, 'x', message_size);
6057
/* Create a new socketpair for each message size to avoid having
6058
to empty the pipe by reading the message to a separate buffer
6059
*/
6060
g_assert_cmpint(socketpair(PF_LOCAL, SOCK_DGRAM
6061
| SOCK_NONBLOCK | SOCK_CLOEXEC, 0,
6062
socketfds), ==, 0);
6063
ssret = send(socketfds[1], message_buffer, message_size,
6064
MSG_NOSIGNAL);
6065
error_t saved_errno = errno;
6066
g_assert_cmpint(close(socketfds[0]), ==, 0);
6067
g_assert_cmpint(close(socketfds[1]), ==, 0);
6068
6069
if(ssret < 0){
6070
if(saved_errno != EMSGSIZE) {
6071
g_test_skip("Skipping EMSGSIZE test");
6072
g_test_message("Error on send(%" PRIuMAX " bytes): %s",
6073
(uintmax_t)message_size,
6074
strerror(saved_errno));
6075
return;
6076
}
6077
break;
6078
} else if(ssret != (ssize_t)message_size){
6079
g_test_skip("Skipping EMSGSIZE test");
6080
g_test_message("Partial send(): %" PRIuMAX " of %" PRIdMAX
6081
" bytes", (uintmax_t)ssret,
6082
(intmax_t)message_size);
6083
return;
6084
}
6085
}
6086
g_test_message("EMSGSIZE triggered by %" PRIdMAX " bytes",
6087
(intmax_t)message_size);
6088
6089
buffer password = {
6090
.data=message_buffer,
6091
.length=message_size - 2, /* Compensate for added '+' and NUL */
6092
.allocated=message_size,
5958
const size_t oversized = 1024*1024; /* Limit seems to be 212960 */
5959
__attribute__((cleanup(cleanup_buffer)))
5960
buffer password = {
5961
.data=malloc(oversized),
5962
.length=oversized,
5963
.allocated=oversized,
6093
5964
};
5965
g_assert_nonnull(password.data);
6094
5966
if(mlock(password.data, password.allocated) != 0){
6095
5967
g_assert_true(errno == EPERM or errno == ENOMEM);
6096
5968
}
5969
/* Construct test password buffer */
5970
/* Start with + since that is what the real procotol uses */
5971
password.data[0] = '+';
5972
/* Set a special character at string end just to mark the end */
5973
password.data[oversized-3] = 'y';
5974
/* Set NUL at buffer end, as suggested by the protocol */
5975
password.data[oversized-2] = '\0';
5976
/* Fill rest of password with 'x' */
5977
memset(password.data+1, 'x', oversized-3);
6097
5978
6098
5979
__attribute__((cleanup(cleanup_queue)))
6099
5980
task_queue *queue = create_queue();
6100
5981
g_assert_nonnull(queue);
5982
int socketfds[2];
6101
5983
g_assert_cmpint(socketpair(PF_LOCAL, SOCK_DGRAM
6102
5984
| SOCK_NONBLOCK | SOCK_CLOEXEC, 0,
6103
5985
socketfds), ==, 0);
8259
8141
g_option_context_free(context);
8260
8142
return should_run_tests != FALSE;
8261
8143
}
8262
8263
/*
8264
Local Variables:
8265
run-tests:
8266
(lambda ()
8267
(if (not (funcall run-tests-in-test-buffer default-directory))
8268
(funcall show-test-buffer-in-test-window)
8269
(funcall remove-test-window)))
8270
run-tests-in-test-buffer:
8271
(lambda (dir)
8272
(with-current-buffer (get-buffer-create "*Test*")
8273
(setq buffer-read-only nil
8274
default-directory dir)
8275
(erase-buffer)
8276
(compilation-mode))
8277
(let ((process-result
8278
(let ((inhibit-read-only t))
8279
(process-file-shell-command
8280
(funcall get-command-line) nil "*Test*"))))
8281
(and (numberp process-result)
8282
(= process-result 0))))
8283
get-command-line:
8284
(lambda ()
8285
(let*
8286
((build-directory
8287
(funcall find-build-directory (buffer-file-name)))
8288
(local-build-directory
8289
(if (fboundp 'file-local-name)
8290
(file-local-name build-directory)
8291
(or (file-remote-p build-directory 'localname)
8292
build-directory)))
8293
(command
8294
(file-relative-name (file-name-sans-extension
8295
(buffer-file-name)) build-directory))
8296
(qbdir (shell-quote-argument local-build-directory))
8297
(qcmd (shell-quote-argument command)))
8298
(format (concat "cd %s && CFLAGS=-Werror make --silent %s"
8299
" && %s --test --verbose") qbdir qcmd qcmd)))
8300
find-build-directory:
8301
(lambda (try-directory &optional base-directory)
8302
(let ((base-directory (or base-directory try-directory)))
8303
(cond ((equal try-directory "/") base-directory)
8304
((file-readable-p
8305
(concat (file-name-as-directory try-directory)
8306
"Makefile")) try-directory)
8307
((funcall find-build-directory
8308
(directory-file-name (file-name-directory
8309
try-directory))
8310
base-directory)))))
8311
show-test-buffer-in-test-window:
8312
(lambda ()
8313
(when (not (get-buffer-window-list "*Test*"))
8314
(setq next-error-last-buffer (get-buffer "*Test*"))
8315
(let* ((side (if (>= (window-width) 146) 'right 'bottom))
8316
(display-buffer-overriding-action
8317
`((display-buffer-in-side-window) (side . ,side)
8318
(window-height . fit-window-to-buffer)
8319
(window-width . fit-window-to-buffer))))
8320
(display-buffer "*Test*"))))
8321
remove-test-window:
8322
(lambda ()
8323
(let ((test-window (get-buffer-window "*Test*")))
8324
(if test-window (delete-window test-window))))
8325
eval: (add-hook 'after-save-hook run-tests 90 t)
8326
End:
8327
*/
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0