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 1135
- compare with another revision
- download diff
- download tarball
- view history from revision 1135
- Committer: Teddy Hogeborn
- Date: 2019-08-01 17:35:45 UTC
- Revision ID: teddy@recompile.se-20190801173545-swvm0c6e1e00qdwi
password-agent: Fix memory alignment issue
On many architectures (armel, armhf, mips, mips64el, mipsel, hppa,
ia64, sh4, and sparc64) GCC shows a warning when casting a "char *" to
a "struct inotify_event *"; The exact warning message from GCC is
"cast increases required alignment of target type [-Wcast-align]".
* dracut-module/password-agent.c (read_inotify_event): Change
"ievent_buffer" to an anonymous struct instead of a char array.
(test_read_inotify_event_IN_CLOSE_WRITE): - '' -
(test_read_inotify_event_IN_MOVED_TO): - '' -
(test_read_inotify_event_IN_DELETE): - '' -
(test_read_inotify_event_IN_CLOSE_WRITE_badname): - '' -
(test_read_inotify_event_IN_MOVED_TO_badname): - '' -
(test_read_inotify_event_IN_DELETE_badname): - '' -
On many architectures (armel, armhf, mips, mips64el, mipsel, hppa,
ia64, sh4, and sparc64) GCC shows a warning when casting a "char *" to
a "struct inotify_event *"; The exact warning message from GCC is
"cast increases required alignment of target type [-Wcast-align]".
* dracut-module/password-agent.c (read_inotify_event): Change
"ievent_buffer" to an anonymous struct instead of a char array.
(test_read_inotify_event_IN_CLOSE_WRITE): - '' -
(test_read_inotify_event_IN_MOVED_TO): - '' -
(test_read_inotify_event_IN_DELETE): - '' -
(test_read_inotify_event_IN_CLOSE_WRITE_badname): - '' -
(test_read_inotify_event_IN_MOVED_TO_badname): - '' -
(test_read_inotify_event_IN_DELETE_badname): - '' -
- files removed:
- debian/mandos.maintscript
- files modified:
- .bzrignore
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 */
59
50
#include <errno.h> /* errno, error_t, EACCES,
60
ENAMETOOLONG, ENOENT, ENOTDIR,
61
ENOMEM, EEXIST, ECHILD, EPERM,
62
EAGAIN, EINTR, ENOBUFS, EADDRINUSE,
51
ENAMETOOLONG, ENOENT, EEXIST,
52
ECHILD, EPERM, ENOMEM, EAGAIN,
53
EINTR, ENOBUFS, EADDRINUSE,
63
54
ECONNREFUSED, ECONNRESET,
64
55
ETOOMANYREFS, EMSGSIZE, EBADF,
65
56
EINVAL */
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 <unistd.h> /* uid_t, gid_t, close(), pipe2(),
77
fork(), _exit(), dup2(),
78
STDOUT_FILENO, setresgid(),
79
setresuid(), execv(), ssize_t,
80
read(), dup3(), getuid(), dup(),
81
STDERR_FILENO, pause(), write(),
82
rmdir(), unlink(), getpid() */
86
83
#include <sys/mman.h> /* munlock(), mlock() */
87
84
#include <fcntl.h> /* O_CLOEXEC, O_NONBLOCK, fcntl(),
88
85
F_GETFD, F_GETFL, FD_CLOEXEC,
89
open(), O_WRONLY, O_NOCTTY,
90
O_RDONLY, O_NOFOLLOW */
86
open(), O_WRONLY, O_RDONLY */
91
87
#include <sys/wait.h> /* waitpid(), WNOHANG, WIFEXITED(),
92
88
WEXITSTATUS() */
93
89
#include <limits.h> /* PIPE_BUF, NAME_MAX, INT_MAX */
94
90
#include <sys/inotify.h> /* inotify_init1(), IN_NONBLOCK,
95
91
IN_CLOEXEC, inotify_add_watch(),
96
92
IN_CLOSE_WRITE, IN_MOVED_TO,
97
IN_MOVED_FROM, IN_DELETE,
98
IN_EXCL_UNLINK, IN_ONLYDIR,
99
struct inotify_event */
93
IN_DELETE, struct inotify_event */
100
94
#include <fnmatch.h> /* fnmatch(), FNM_FILE_NAME */
101
#include <stdio.h> /* asprintf(), FILE, stderr, fopen(),
102
fclose(), getline(), sscanf(),
103
feof(), ferror(), rename(),
104
fdopen(), fprintf(), fscanf() */
95
#include <stdio.h> /* asprintf(), FILE, fopen(),
96
getline(), sscanf(), feof(),
97
ferror(), fclose(), stderr,
98
rename(), fdopen(), fprintf(),
99
fscanf() */
105
100
#include <glib.h> /* GKeyFile, g_key_file_free(), g_key_file_new(),
106
101
GError, g_key_file_load_from_file(),
107
102
G_KEY_FILE_NONE, TRUE, G_FILE_ERROR_NOENT,
112
107
g_assert_null(), g_assert_false(),
113
108
g_assert_cmpint(), g_assert_cmpuint(),
114
109
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(),
110
g_test_init(), g_test_add(), g_test_run(),
111
GOptionContext, g_option_context_new(),
118
112
g_option_context_set_help_enabled(), FALSE,
119
113
g_option_context_set_ignore_unknown_options(),
120
114
gboolean, GOptionEntry, G_OPTION_ARG_NONE,
151
145
mono_microsecs next_run;
152
146
} __attribute__((designated_init)) task_queue;
153
147
154
/* "task_func" - A function type for task functions
148
/* "func_type" - A function type for task functions
155
149
156
150
I.e. functions for the code which runs when a task is run, all have
157
151
this type */
437
431
case EACCES:
438
432
case ENAMETOOLONG:
439
433
case ENOENT:
440
case ENOTDIR:
441
434
return EX_OSFILE;
442
435
default:
443
436
return EX_OSERR;
654
647
655
648
__attribute__((nonnull, warn_unused_result))
656
649
bool add_to_queue(task_queue *const queue, const task_context task){
657
if((queue->length + 1) > (SIZE_MAX / sizeof(task_context))){
658
/* overflow */
659
error(0, ENOMEM, "Failed to allocate %" PRIuMAX
660
" tasks for queue->tasks", (uintmax_t)(queue->length + 1));
661
errno = ENOMEM;
662
return false;
663
}
664
650
const size_t needed_size = sizeof(task_context)*(queue->length + 1);
665
651
if(needed_size > (queue->allocated)){
666
652
task_context *const new_tasks = realloc(queue->tasks,
871
857
}
872
858
close(pipefds[1]);
873
859
874
if(pid == -1){
875
error(0, errno, "Failed to fork()");
876
close(pipefds[0]);
877
return false;
878
}
879
880
860
if(not add_to_queue(queue, (task_context){
881
861
.func=wait_for_mandos_client_exit,
882
862
.pid=pid,
1037
1017
return false;
1038
1018
}
1039
1019
1040
if(inotify_add_watch(fd, dir, IN_CLOSE_WRITE | IN_MOVED_TO
1041
| IN_MOVED_FROM| IN_DELETE | IN_EXCL_UNLINK
1042
| IN_ONLYDIR)
1020
if(inotify_add_watch(fd, dir, IN_CLOSE_WRITE
1021
| IN_MOVED_TO | IN_DELETE)
1043
1022
== -1){
1044
1023
error(0, errno, "Failed to create inotify watch on %s", dir);
1045
1024
return false;
1098
1077
} ievent_buffer;
1099
1078
struct inotify_event *const ievent = &ievent_buffer.event;
1100
1079
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
1080
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
1081
if(read_length == 0){ /* EOF */
1111
1082
error(0, 0, "Got EOF from inotify fd for directory %s", filename);
1112
1083
*quit_now = true;
1148
1119
immediately */
1149
1120
queue->next_run = 1;
1150
1121
}
1151
} else if(ievent->mask & (IN_MOVED_FROM | IN_DELETE)){
1122
} else if(ievent->mask & IN_DELETE){
1152
1123
if(not string_set_add(cancelled_filenames,
1153
1124
question_filename)){
1154
1125
error(0, errno, "Could not add question %s to"
1204
1175
bool *const password_is_read = task.password_is_read;
1205
1176
1206
1177
/* 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 */
1178
question file. See <https://www.freedesktop.org/wiki/Software
1179
/systemd/PasswordAgents/> for specification of contents */
1209
1180
__attribute__((nonnull))
1210
1181
void cleanup_g_key_file(GKeyFile **key_file){
1211
1182
if(*key_file != NULL){
1488
1459
if(send_buffer == NULL){
1489
1460
error(0, errno, "Failed to allocate send_buffer");
1490
1461
} else {
1491
#if defined(__GNUC__) and __GNUC__ >= 5
1492
#pragma GCC diagnostic push
1493
/* mlock() does not access the memory */
1494
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
1495
#endif
1496
1462
if(mlock(send_buffer, send_buffer_length) != 0){
1497
#if defined(__GNUC__) and __GNUC__ >= 5
1498
#pragma GCC diagnostic pop
1499
#endif
1500
1463
/* Warn but do not treat as fatal error */
1501
1464
if(errno != EPERM and errno != ENOMEM){
1502
1465
error(0, errno, "Failed to lock memory for password"
1509
1472
not. You may but don't have to include a final NUL byte in
1510
1473
your message.
1511
1474
1512
— <https://systemd.io/PASSWORD_AGENTS/> (Tue, 15 Sep 2020
1513
14:24:20 GMT)
1475
— <https://www.freedesktop.org/wiki/Software/systemd/
1476
PasswordAgents/> (Wed 08 Oct 2014 02:14:28 AM UTC)
1514
1477
*/
1515
1478
send_buffer[0] = '+'; /* Prefix with "+" */
1516
1479
/* Always add an extra NUL */
1521
1484
errno = 0;
1522
1485
ssize_t ssret = send(fd, send_buffer, send_buffer_length,
1523
1486
MSG_NOSIGNAL);
1524
const error_t saved_errno = (ssret < 0) ? errno : 0;
1487
const error_t saved_errno = errno;
1525
1488
#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 25)
1526
1489
explicit_bzero(send_buffer, send_buffer_length);
1527
1490
#else
1545
1508
/* Retry, below */
1546
1509
break;
1547
1510
case EMSGSIZE:
1548
error(0, saved_errno, "Password of size %" PRIuMAX
1549
" is too big", (uintmax_t)password->length);
1511
error(0, 0, "Password of size %" PRIuMAX " is too big",
1512
(uintmax_t)password->length);
1550
1513
#if __GNUC__ < 7
1551
1514
/* FALLTHROUGH */
1552
1515
#else
1554
1517
#endif
1555
1518
case 0:
1556
1519
if(ssret >= 0 and ssret < (ssize_t)send_buffer_length){
1557
error(0, 0, "Password only partially sent to socket %s: %"
1558
PRIuMAX " out of %" PRIuMAX " bytes sent", filename,
1559
(uintmax_t)ssret, (uintmax_t)send_buffer_length);
1520
error(0, 0, "Password only partially sent to socket");
1560
1521
}
1561
1522
#if __GNUC__ < 7
1562
1523
/* FALLTHROUGH */
1918
1879
g_assert_true(queue->tasks[0].func == dummy_func);
1919
1880
}
1920
1881
1921
static void test_add_to_queue_overflow(__attribute__((unused))
1922
test_fixture *fixture,
1923
__attribute__((unused))
1924
gconstpointer user_data){
1925
__attribute__((cleanup(cleanup_queue)))
1926
task_queue *queue = create_queue();
1927
g_assert_nonnull(queue);
1928
g_assert_true(queue->length == 0);
1929
queue->length = SIZE_MAX / sizeof(task_context); /* fake max size */
1930
1931
FILE *real_stderr = stderr;
1932
FILE *devnull = fopen("/dev/null", "we");
1933
g_assert_nonnull(devnull);
1934
stderr = devnull;
1935
const bool ret = add_to_queue(queue,
1936
(task_context){ .func=dummy_func });
1937
g_assert_true(errno == ENOMEM);
1938
g_assert_false(ret);
1939
stderr = real_stderr;
1940
g_assert_cmpint(fclose(devnull), ==, 0);
1941
queue->length = 0; /* Restore real size */
1942
}
1943
1944
1882
static void dummy_func(__attribute__((unused))
1945
1883
const task_context task,
1946
1884
__attribute__((unused))
2217
2155
}
2218
2156
exit(EXIT_SUCCESS);
2219
2157
}
2220
if(pid == -1){
2221
error(EXIT_FAILURE, errno, "Failed to fork()");
2222
}
2223
2224
2158
int status;
2225
2159
waitpid(pid, &status, 0);
2226
2160
if(WIFEXITED(status) and (WEXITSTATUS(status) == EXIT_SUCCESS)){
2288
2222
2289
2223
{
2290
2224
__attribute__((cleanup(cleanup_close)))
2291
const int devnull_fd = open("/dev/null",
2292
O_WRONLY | O_CLOEXEC | O_NOCTTY);
2225
const int devnull_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);
2293
2226
g_assert_cmpint(devnull_fd, >=, 0);
2294
2227
__attribute__((cleanup(cleanup_close)))
2295
2228
const int real_stderr_fd = dup(STDERR_FILENO);
2319
2252
{
2320
2253
__attribute__((cleanup(cleanup_close)))
2321
2254
const int devnull_fd = open("/dev/null",
2322
O_WRONLY | O_CLOEXEC | O_NOCTTY);
2255
O_WRONLY | O_CLOEXEC);
2323
2256
g_assert_cmpint(devnull_fd, >=, 0);
2324
2257
__attribute__((cleanup(cleanup_close)))
2325
2258
const int real_stderr_fd = dup(STDERR_FILENO);
2669
2602
bool password_is_read = false;
2670
2603
const char helper_directory[] = "/nonexistent";
2671
2604
const char *const argv[] = { "/bin/sh", "-c",
2672
"printf %s \"${MANDOSPLUGINHELPERDIR}\"", NULL };
2605
"echo -n ${MANDOSPLUGINHELPERDIR}", NULL };
2673
2606
2674
2607
const bool success = start_mandos_client(queue, epoll_fd,
2675
2608
&mandos_client_exited,
2970
2903
2971
2904
__attribute__((cleanup(cleanup_close)))
2972
2905
const int devnull_fd = open("/dev/null",
2973
O_WRONLY | O_CLOEXEC | O_NOCTTY);
2906
O_WRONLY | O_CLOEXEC);
2974
2907
g_assert_cmpint(devnull_fd, >=, 0);
2975
2908
__attribute__((cleanup(cleanup_close)))
2976
2909
const int real_stderr_fd = dup(STDERR_FILENO);
3041
2974
3042
2975
__attribute__((cleanup(cleanup_close)))
3043
2976
const int devnull_fd = open("/dev/null",
3044
O_WRONLY | O_CLOEXEC, O_NOCTTY);
2977
O_WRONLY | O_CLOEXEC);
3045
2978
g_assert_cmpint(devnull_fd, >=, 0);
3046
2979
__attribute__((cleanup(cleanup_close)))
3047
2980
const int real_stderr_fd = dup(STDERR_FILENO);
3085
3018
buffer password = {};
3086
3019
3087
3020
/* Reading /proc/self/mem from offset 0 will always give EIO */
3088
const int fd = open("/proc/self/mem",
3089
O_RDONLY | O_CLOEXEC | O_NOCTTY);
3021
const int fd = open("/proc/self/mem", O_RDONLY | O_CLOEXEC);
3090
3022
3091
3023
bool password_is_read = false;
3092
3024
bool quit_now = false;
3520
3452
g_assert_cmpuint((unsigned int)queue->length, ==, 0);
3521
3453
}
3522
3454
3523
static void test_add_inotify_dir_watch_nondir(__attribute__((unused))
3524
test_fixture *fixture,
3525
__attribute__((unused))
3526
gconstpointer
3527
user_data){
3528
__attribute__((cleanup(cleanup_close)))
3529
const int epoll_fd = epoll_create1(EPOLL_CLOEXEC);
3530
g_assert_cmpint(epoll_fd, >=, 0);
3531
__attribute__((cleanup(cleanup_queue)))
3532
task_queue *queue = create_queue();
3533
g_assert_nonnull(queue);
3534
__attribute__((cleanup(string_set_clear)))
3535
string_set cancelled_filenames = {};
3536
const mono_microsecs current_time = 0;
3537
3538
bool quit_now = false;
3539
buffer password = {};
3540
bool mandos_client_exited = false;
3541
bool password_is_read = false;
3542
3543
const char not_a_directory[] = "/dev/tty";
3544
3545
FILE *real_stderr = stderr;
3546
FILE *devnull = fopen("/dev/null", "we");
3547
g_assert_nonnull(devnull);
3548
stderr = devnull;
3549
g_assert_false(add_inotify_dir_watch(queue, epoll_fd, &quit_now,
3550
&password, not_a_directory,
3551
&cancelled_filenames,
3552
¤t_time,
3553
&mandos_client_exited,
3554
&password_is_read));
3555
stderr = real_stderr;
3556
g_assert_cmpint(fclose(devnull), ==, 0);
3557
3558
g_assert_cmpuint((unsigned int)queue->length, ==, 0);
3559
}
3560
3561
3455
static void test_add_inotify_dir_watch_EAGAIN(__attribute__((unused))
3562
3456
test_fixture *fixture,
3563
3457
__attribute__((unused))
3778
3672
}
3779
3673
3780
3674
static
3781
void test_add_inotify_dir_watch_IN_MOVED_FROM(__attribute__((unused))
3782
test_fixture *fixture,
3783
__attribute__((unused))
3784
gconstpointer
3785
user_data){
3786
__attribute__((cleanup(cleanup_close)))
3787
const int epoll_fd = epoll_create1(EPOLL_CLOEXEC);
3788
g_assert_cmpint(epoll_fd, >=, 0);
3789
__attribute__((cleanup(cleanup_queue)))
3790
task_queue *queue = create_queue();
3791
g_assert_nonnull(queue);
3792
__attribute__((cleanup(string_set_clear)))
3793
string_set cancelled_filenames = {};
3794
const mono_microsecs current_time = 0;
3795
3796
bool quit_now = false;
3797
buffer password = {};
3798
bool mandos_client_exited = false;
3799
bool password_is_read = false;
3800
3801
__attribute__((cleanup(cleanup_string)))
3802
char *tempdir = make_temporary_directory();
3803
g_assert_nonnull(tempdir);
3804
3805
__attribute__((cleanup(cleanup_string)))
3806
char *tempfilename = make_temporary_file_in_directory(tempdir);
3807
g_assert_nonnull(tempfilename);
3808
3809
__attribute__((cleanup(cleanup_string)))
3810
char *targetdir = make_temporary_directory();
3811
g_assert_nonnull(targetdir);
3812
3813
__attribute__((cleanup(cleanup_string)))
3814
char *targetfilename = NULL;
3815
g_assert_cmpint(asprintf(&targetfilename, "%s/%s", targetdir,
3816
basename(tempfilename)), >, 0);
3817
g_assert_nonnull(targetfilename);
3818
3819
g_assert_true(add_inotify_dir_watch(queue, epoll_fd, &quit_now,
3820
&password, tempdir,
3821
&cancelled_filenames,
3822
¤t_time,
3823
&mandos_client_exited,
3824
&password_is_read));
3825
3826
g_assert_cmpint(rename(tempfilename, targetfilename), ==, 0);
3827
3828
const task_context *const added_read_task
3829
= find_matching_task(queue,
3830
(task_context){ .func=read_inotify_event });
3831
g_assert_nonnull(added_read_task);
3832
3833
/* "sufficient to read at least one event." - inotify(7) */
3834
const size_t ievent_size = (sizeof(struct inotify_event)
3835
+ NAME_MAX + 1);
3836
struct inotify_event *ievent = malloc(ievent_size);
3837
g_assert_nonnull(ievent);
3838
3839
ssize_t read_size = read(added_read_task->fd, ievent, ievent_size);
3840
3841
g_assert_cmpint((int)read_size, >, 0);
3842
g_assert_true(ievent->mask & IN_MOVED_FROM);
3843
g_assert_cmpstr(ievent->name, ==, basename(tempfilename));
3844
3845
free(ievent);
3846
3847
g_assert_cmpint(unlink(targetfilename), ==, 0);
3848
g_assert_cmpint(rmdir(targetdir), ==, 0);
3849
g_assert_cmpint(rmdir(tempdir), ==, 0);
3850
}
3851
3852
static
3853
3675
void test_add_inotify_dir_watch_IN_DELETE(__attribute__((unused))
3854
3676
test_fixture *fixture,
3855
3677
__attribute__((unused))
3913
3735
g_assert_cmpint(rmdir(tempdir), ==, 0);
3914
3736
}
3915
3737
3916
static
3917
void test_add_inotify_dir_watch_IN_EXCL_UNLINK(__attribute__((unused))
3918
test_fixture *fixture,
3919
__attribute__((unused))
3920
gconstpointer
3921
user_data){
3922
__attribute__((cleanup(cleanup_close)))
3923
const int epoll_fd = epoll_create1(EPOLL_CLOEXEC);
3924
g_assert_cmpint(epoll_fd, >=, 0);
3925
__attribute__((cleanup(cleanup_queue)))
3926
task_queue *queue = create_queue();
3927
g_assert_nonnull(queue);
3928
__attribute__((cleanup(string_set_clear)))
3929
string_set cancelled_filenames = {};
3930
const mono_microsecs current_time = 0;
3931
3932
bool quit_now = false;
3933
buffer password = {};
3934
bool mandos_client_exited = false;
3935
bool password_is_read = false;
3936
3937
__attribute__((cleanup(cleanup_string)))
3938
char *tempdir = make_temporary_directory();
3939
g_assert_nonnull(tempdir);
3940
3941
__attribute__((cleanup(cleanup_string)))
3942
char *tempfile = make_temporary_file_in_directory(tempdir);
3943
g_assert_nonnull(tempfile);
3944
int tempfile_fd = open(tempfile, O_WRONLY | O_CLOEXEC | O_NOCTTY
3945
| O_NOFOLLOW);
3946
g_assert_cmpint(tempfile_fd, >, 2);
3947
3948
g_assert_true(add_inotify_dir_watch(queue, epoll_fd, &quit_now,
3949
&password, tempdir,
3950
&cancelled_filenames,
3951
¤t_time,
3952
&mandos_client_exited,
3953
&password_is_read));
3954
g_assert_cmpint(unlink(tempfile), ==, 0);
3955
3956
g_assert_cmpuint((unsigned int)queue->length, >, 0);
3957
3958
const task_context *const added_read_task
3959
= find_matching_task(queue,
3960
(task_context){ .func=read_inotify_event });
3961
g_assert_nonnull(added_read_task);
3962
3963
g_assert_cmpint(added_read_task->fd, >, 2);
3964
g_assert_true(fd_has_cloexec_and_nonblock(added_read_task->fd));
3965
3966
/* "sufficient to read at least one event." - inotify(7) */
3967
const size_t ievent_size = (sizeof(struct inotify_event)
3968
+ NAME_MAX + 1);
3969
struct inotify_event *ievent = malloc(ievent_size);
3970
g_assert_nonnull(ievent);
3971
3972
ssize_t read_size = 0;
3973
read_size = read(added_read_task->fd, ievent, ievent_size);
3974
3975
g_assert_cmpint((int)read_size, >, 0);
3976
g_assert_true(ievent->mask & IN_DELETE);
3977
g_assert_cmpstr(ievent->name, ==, basename(tempfile));
3978
3979
g_assert_cmpint(close(tempfile_fd), ==, 0);
3980
3981
/* IN_EXCL_UNLINK should make the closing of the previously unlinked
3982
file not appear as an ievent, so we should not see it now. */
3983
read_size = read(added_read_task->fd, ievent, ievent_size);
3984
g_assert_cmpint((int)read_size, ==, -1);
3985
g_assert_true(errno == EAGAIN);
3986
3987
free(ievent);
3988
3989
g_assert_cmpint(rmdir(tempdir), ==, 0);
3990
}
3991
3992
3738
static void test_read_inotify_event_readerror(__attribute__((unused))
3993
3739
test_fixture *fixture,
3994
3740
__attribute__((unused))
4000
3746
const mono_microsecs current_time = 0;
4001
3747
4002
3748
/* Reading /proc/self/mem from offset 0 will always result in EIO */
4003
const int fd = open("/proc/self/mem",
4004
O_RDONLY | O_CLOEXEC | O_NOCTTY);
3749
const int fd = open("/proc/self/mem", O_RDONLY | O_CLOEXEC);
4005
3750
4006
3751
bool quit_now = false;
4007
3752
__attribute__((cleanup(cleanup_queue)))
4198
3943
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4199
3944
const size_t ievent_size = (sizeof(struct inotify_event)
4200
3945
+ sizeof(dummy_file_name));
4201
#if defined(__GNUC__) and __GNUC__ >= 11
4202
#pragma GCC diagnostic push
4203
/* ievent is pointing into a struct which is of sufficient size */
4204
#pragma GCC diagnostic ignored "-Wstringop-overread"
4205
#endif
4206
3946
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4207
3947
==, ievent_size);
4208
#if defined(__GNUC__) and __GNUC__ >= 11
4209
#pragma GCC diagnostic pop
4210
#endif
4211
3948
g_assert_cmpint(close(pipefds[1]), ==, 0);
4212
3949
4213
3950
bool quit_now = false;
4301
4038
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4302
4039
const size_t ievent_size = (sizeof(struct inotify_event)
4303
4040
+ sizeof(dummy_file_name));
4304
#if defined(__GNUC__) and __GNUC__ >= 11
4305
#pragma GCC diagnostic push
4306
/* ievent is pointing into a struct which is of sufficient size */
4307
#pragma GCC diagnostic ignored "-Wstringop-overread"
4308
#endif
4309
4041
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4310
4042
==, ievent_size);
4311
#if defined(__GNUC__) and __GNUC__ >= 11
4312
#pragma GCC diagnostic pop
4313
#endif
4314
4043
g_assert_cmpint(close(pipefds[1]), ==, 0);
4315
4044
4316
4045
bool quit_now = false;
4375
4104
}));
4376
4105
}
4377
4106
4378
static
4379
void test_read_inotify_event_IN_MOVED_FROM(__attribute__((unused))
4380
test_fixture *fixture,
4381
__attribute__((unused))
4382
gconstpointer user_data){
4383
__attribute__((cleanup(cleanup_close)))
4384
const int epoll_fd = epoll_create1(EPOLL_CLOEXEC);
4385
g_assert_cmpint(epoll_fd, >=, 0);
4386
__attribute__((cleanup(string_set_clear)))
4387
string_set cancelled_filenames = {};
4388
const mono_microsecs current_time = 0;
4389
4390
int pipefds[2];
4391
g_assert_cmpint(pipe2(pipefds, O_CLOEXEC | O_NONBLOCK), ==, 0);
4392
4393
/* "sufficient to read at least one event." - inotify(7) */
4394
const size_t ievent_max_size = (sizeof(struct inotify_event)
4395
+ NAME_MAX + 1);
4396
g_assert_cmpint(ievent_max_size, <=, PIPE_BUF);
4397
struct {
4398
struct inotify_event event;
4399
char name_buffer[NAME_MAX + 1];
4400
} ievent_buffer;
4401
struct inotify_event *const ievent = &ievent_buffer.event;
4402
4403
const char dummy_file_name[] = "ask.dummy_file_name";
4404
ievent->mask = IN_MOVED_FROM;
4405
ievent->len = sizeof(dummy_file_name);
4406
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4407
const size_t ievent_size = (sizeof(struct inotify_event)
4408
+ sizeof(dummy_file_name));
4409
#if defined(__GNUC__) and __GNUC__ >= 11
4410
#pragma GCC diagnostic push
4411
/* ievent is pointing into a struct which is of sufficient size */
4412
#pragma GCC diagnostic ignored "-Wstringop-overread"
4413
#endif
4414
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4415
==, ievent_size);
4416
#if defined(__GNUC__) and __GNUC__ >= 11
4417
#pragma GCC diagnostic pop
4418
#endif
4419
g_assert_cmpint(close(pipefds[1]), ==, 0);
4420
4421
bool quit_now = false;
4422
buffer password = {};
4423
bool mandos_client_exited = false;
4424
bool password_is_read = false;
4425
__attribute__((cleanup(cleanup_queue)))
4426
task_queue *queue = create_queue();
4427
g_assert_nonnull(queue);
4428
4429
task_context task = {
4430
.func=read_inotify_event,
4431
.epoll_fd=epoll_fd,
4432
.fd=pipefds[0],
4433
.quit_now=&quit_now,
4434
.password=&password,
4435
.filename=strdup("/nonexistent"),
4436
.cancelled_filenames=&cancelled_filenames,
4437
.current_time=¤t_time,
4438
.mandos_client_exited=&mandos_client_exited,
4439
.password_is_read=&password_is_read,
4440
};
4441
task.func(task, queue);
4442
g_assert_false(quit_now);
4443
g_assert_true(queue->next_run == 0);
4444
g_assert_cmpuint((unsigned int)queue->length, ==, 1);
4445
4446
g_assert_nonnull(find_matching_task(queue, (task_context){
4447
.func=read_inotify_event,
4448
.epoll_fd=epoll_fd,
4449
.fd=pipefds[0],
4450
.quit_now=&quit_now,
4451
.password=&password,
4452
.filename=task.filename,
4453
.cancelled_filenames=&cancelled_filenames,
4454
.current_time=¤t_time,
4455
.mandos_client_exited=&mandos_client_exited,
4456
.password_is_read=&password_is_read,
4457
}));
4458
4459
g_assert_true(epoll_set_contains(epoll_fd, pipefds[0],
4460
EPOLLIN | EPOLLRDHUP));
4461
4462
__attribute__((cleanup(cleanup_string)))
4463
char *filename = NULL;
4464
g_assert_cmpint(asprintf(&filename, "%s/%s", task.filename,
4465
dummy_file_name), >, 0);
4466
g_assert_nonnull(filename);
4467
g_assert_true(string_set_contains(*task.cancelled_filenames,
4468
filename));
4469
}
4470
4471
4107
static void test_read_inotify_event_IN_DELETE(__attribute__((unused))
4472
4108
test_fixture *fixture,
4473
4109
__attribute__((unused))
4499
4135
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4500
4136
const size_t ievent_size = (sizeof(struct inotify_event)
4501
4137
+ sizeof(dummy_file_name));
4502
#if defined(__GNUC__) and __GNUC__ >= 11
4503
#pragma GCC diagnostic push
4504
/* ievent is pointing into a struct which is of sufficient size */
4505
#pragma GCC diagnostic ignored "-Wstringop-overread"
4506
#endif
4507
4138
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4508
4139
==, ievent_size);
4509
#if defined(__GNUC__) and __GNUC__ >= 11
4510
#pragma GCC diagnostic pop
4511
#endif
4512
4140
g_assert_cmpint(close(pipefds[1]), ==, 0);
4513
4141
4514
4142
bool quit_now = false;
4591
4219
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4592
4220
const size_t ievent_size = (sizeof(struct inotify_event)
4593
4221
+ sizeof(dummy_file_name));
4594
#if defined(__GNUC__) and __GNUC__ >= 11
4595
#pragma GCC diagnostic push
4596
/* ievent is pointing into a struct which is of sufficient size */
4597
#pragma GCC diagnostic ignored "-Wstringop-overread"
4598
#endif
4599
4222
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4600
4223
==, ievent_size);
4601
#if defined(__GNUC__) and __GNUC__ >= 11
4602
#pragma GCC diagnostic pop
4603
#endif
4604
4224
g_assert_cmpint(close(pipefds[1]), ==, 0);
4605
4225
4606
4226
bool quit_now = false;
4675
4295
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4676
4296
const size_t ievent_size = (sizeof(struct inotify_event)
4677
4297
+ sizeof(dummy_file_name));
4678
#if defined(__GNUC__) and __GNUC__ >= 11
4679
#pragma GCC diagnostic push
4680
/* ievent is pointing into a struct which is of sufficient size */
4681
#pragma GCC diagnostic ignored "-Wstringop-overread"
4682
#endif
4683
4298
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4684
4299
==, ievent_size);
4685
#if defined(__GNUC__) and __GNUC__ >= 11
4686
#pragma GCC diagnostic pop
4687
#endif
4688
4300
g_assert_cmpint(close(pipefds[1]), ==, 0);
4689
4301
4690
4302
bool quit_now = false;
4730
4342
EPOLLIN | EPOLLRDHUP));
4731
4343
}
4732
4344
4733
static void
4734
test_read_inotify_event_IN_MOVED_FROM_badname(__attribute__((unused))
4735
test_fixture *fixture,
4736
__attribute__((unused))
4737
gconstpointer
4738
user_data){
4739
__attribute__((cleanup(cleanup_close)))
4740
const int epoll_fd = epoll_create1(EPOLL_CLOEXEC);
4741
g_assert_cmpint(epoll_fd, >=, 0);
4742
__attribute__((cleanup(string_set_clear)))
4743
string_set cancelled_filenames = {};
4744
const mono_microsecs current_time = 0;
4745
4746
int pipefds[2];
4747
g_assert_cmpint(pipe2(pipefds, O_CLOEXEC | O_NONBLOCK), ==, 0);
4748
4749
/* "sufficient to read at least one event." - inotify(7) */
4750
const size_t ievent_max_size = (sizeof(struct inotify_event)
4751
+ NAME_MAX + 1);
4752
g_assert_cmpint(ievent_max_size, <=, PIPE_BUF);
4753
struct {
4754
struct inotify_event event;
4755
char name_buffer[NAME_MAX + 1];
4756
} ievent_buffer;
4757
struct inotify_event *const ievent = &ievent_buffer.event;
4758
4759
const char dummy_file_name[] = "ignored.dummy_file_name";
4760
ievent->mask = IN_MOVED_FROM;
4761
ievent->len = sizeof(dummy_file_name);
4762
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4763
const size_t ievent_size = (sizeof(struct inotify_event)
4764
+ sizeof(dummy_file_name));
4765
#if defined(__GNUC__) and __GNUC__ >= 11
4766
#pragma GCC diagnostic push
4767
/* ievent is pointing into a struct which is of sufficient size */
4768
#pragma GCC diagnostic ignored "-Wstringop-overread"
4769
#endif
4770
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4771
==, ievent_size);
4772
#if defined(__GNUC__) and __GNUC__ >= 11
4773
#pragma GCC diagnostic pop
4774
#endif
4775
g_assert_cmpint(close(pipefds[1]), ==, 0);
4776
4777
bool quit_now = false;
4778
buffer password = {};
4779
bool mandos_client_exited = false;
4780
bool password_is_read = false;
4781
__attribute__((cleanup(cleanup_queue)))
4782
task_queue *queue = create_queue();
4783
g_assert_nonnull(queue);
4784
4785
task_context task = {
4786
.func=read_inotify_event,
4787
.epoll_fd=epoll_fd,
4788
.fd=pipefds[0],
4789
.quit_now=&quit_now,
4790
.password=&password,
4791
.filename=strdup("/nonexistent"),
4792
.cancelled_filenames=&cancelled_filenames,
4793
.current_time=¤t_time,
4794
.mandos_client_exited=&mandos_client_exited,
4795
.password_is_read=&password_is_read,
4796
};
4797
task.func(task, queue);
4798
g_assert_false(quit_now);
4799
g_assert_true(queue->next_run == 0);
4800
g_assert_cmpuint((unsigned int)queue->length, ==, 1);
4801
4802
g_assert_nonnull(find_matching_task(queue, (task_context){
4803
.func=read_inotify_event,
4804
.epoll_fd=epoll_fd,
4805
.fd=pipefds[0],
4806
.quit_now=&quit_now,
4807
.password=&password,
4808
.filename=task.filename,
4809
.cancelled_filenames=&cancelled_filenames,
4810
.current_time=¤t_time,
4811
.mandos_client_exited=&mandos_client_exited,
4812
.password_is_read=&password_is_read,
4813
}));
4814
4815
g_assert_true(epoll_set_contains(epoll_fd, pipefds[0],
4816
EPOLLIN | EPOLLRDHUP));
4817
4818
__attribute__((cleanup(cleanup_string)))
4819
char *filename = NULL;
4820
g_assert_cmpint(asprintf(&filename, "%s/%s", task.filename,
4821
dummy_file_name), >, 0);
4822
g_assert_nonnull(filename);
4823
g_assert_false(string_set_contains(cancelled_filenames, filename));
4824
}
4825
4826
4345
static
4827
4346
void test_read_inotify_event_IN_DELETE_badname(__attribute__((unused))
4828
4347
test_fixture *fixture,
4855
4374
memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));
4856
4375
const size_t ievent_size = (sizeof(struct inotify_event)
4857
4376
+ sizeof(dummy_file_name));
4858
#if defined(__GNUC__) and __GNUC__ >= 11
4859
#pragma GCC diagnostic push
4860
/* ievent is pointing into a struct which is of sufficient size */
4861
#pragma GCC diagnostic ignored "-Wstringop-overread"
4862
#endif
4863
4377
g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),
4864
4378
==, ievent_size);
4865
#if defined(__GNUC__) and __GNUC__ >= 11
4866
#pragma GCC diagnostic pop
4867
#endif
4868
4379
g_assert_cmpint(close(pipefds[1]), ==, 0);
4869
4380
4870
4381
bool quit_now = false;
5756
5267
__attribute__((unused))
5757
5268
gconstpointer user_data){
5758
5269
__attribute__((cleanup(cleanup_close)))
5759
const int epoll_fd = open("/dev/null",
5760
O_WRONLY | O_CLOEXEC | O_NOCTTY);
5270
const int epoll_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);
5761
5271
__attribute__((cleanup(cleanup_string)))
5762
5272
char *const question_filename = strdup("/nonexistent/question");
5763
5273
g_assert_nonnull(question_filename);
5892
5402
char write_data[PIPE_BUF];
5893
5403
{
5894
5404
/* Construct test password buffer */
5895
/* Start with + since that is what the real protocol uses */
5405
/* Start with + since that is what the real procotol uses */
5896
5406
write_data[0] = '+';
5897
5407
/* Set a special character at string end just to mark the end */
5898
5408
write_data[sizeof(write_data)-2] = 'y';
6050
5560
char *const filename = strdup("/nonexistent/socket");
6051
5561
__attribute__((cleanup(string_set_clear)))
6052
5562
string_set cancelled_filenames = {};
6053
int socketfds[2];
6054
6055
/* Find a message size which triggers EMSGSIZE */
6056
__attribute__((cleanup(cleanup_string)))
6057
char *message_buffer = NULL;
6058
size_t message_size = PIPE_BUF + 1;
6059
for(ssize_t ssret = 0; ssret >= 0; message_size += 1024){
6060
if(message_size >= 1024*1024*1024){ /* 1 GiB */
6061
g_test_skip("Skipping EMSGSIZE test: Will not try 1GiB");
6062
return;
6063
}
6064
message_buffer = realloc(message_buffer, message_size);
6065
if(message_buffer == NULL){
6066
g_test_skip("Skipping EMSGSIZE test");
6067
g_test_message("Failed to malloc() %" PRIuMAX " bytes",
6068
(uintmax_t)message_size);
6069
return;
6070
}
6071
/* Fill buffer with 'x' */
6072
memset(message_buffer, 'x', message_size);
6073
/* Create a new socketpair for each message size to avoid having
6074
to empty the pipe by reading the message to a separate buffer
6075
*/
6076
g_assert_cmpint(socketpair(PF_LOCAL, SOCK_DGRAM
6077
| SOCK_NONBLOCK | SOCK_CLOEXEC, 0,
6078
socketfds), ==, 0);
6079
ssret = send(socketfds[1], message_buffer, message_size,
6080
MSG_NOSIGNAL);
6081
error_t saved_errno = errno;
6082
g_assert_cmpint(close(socketfds[0]), ==, 0);
6083
g_assert_cmpint(close(socketfds[1]), ==, 0);
6084
6085
if(ssret < 0){
6086
if(saved_errno != EMSGSIZE) {
6087
g_test_skip("Skipping EMSGSIZE test");
6088
g_test_message("Error on send(%" PRIuMAX " bytes): %s",
6089
(uintmax_t)message_size,
6090
strerror(saved_errno));
6091
return;
6092
}
6093
break;
6094
} else if(ssret != (ssize_t)message_size){
6095
g_test_skip("Skipping EMSGSIZE test");
6096
g_test_message("Partial send(): %" PRIuMAX " of %" PRIdMAX
6097
" bytes", (uintmax_t)ssret,
6098
(intmax_t)message_size);
6099
return;
6100
}
6101
}
6102
g_test_message("EMSGSIZE triggered by %" PRIdMAX " bytes",
6103
(intmax_t)message_size);
6104
6105
buffer password = {
6106
.data=message_buffer,
6107
.length=message_size - 2, /* Compensate for added '+' and NUL */
6108
.allocated=message_size,
5563
const size_t oversized = 1024*1024; /* Limit seems to be 212960 */
5564
__attribute__((cleanup(cleanup_buffer)))
5565
buffer password = {
5566
.data=malloc(oversized),
5567
.length=oversized,
5568
.allocated=oversized,
6109
5569
};
5570
g_assert_nonnull(password.data);
6110
5571
if(mlock(password.data, password.allocated) != 0){
6111
5572
g_assert_true(errno == EPERM or errno == ENOMEM);
6112
5573
}
5574
/* Construct test password buffer */
5575
/* Start with + since that is what the real procotol uses */
5576
password.data[0] = '+';
5577
/* Set a special character at string end just to mark the end */
5578
password.data[oversized-3] = 'y';
5579
/* Set NUL at buffer end, as suggested by the protocol */
5580
password.data[oversized-2] = '\0';
5581
/* Fill rest of password with 'x' */
5582
memset(password.data+1, 'x', oversized-3);
6113
5583
6114
5584
__attribute__((cleanup(cleanup_queue)))
6115
5585
task_queue *queue = create_queue();
6116
5586
g_assert_nonnull(queue);
5587
int socketfds[2];
6117
5588
g_assert_cmpint(socketpair(PF_LOCAL, SOCK_DGRAM
6118
5589
| SOCK_NONBLOCK | SOCK_CLOEXEC, 0,
6119
5590
socketfds), ==, 0);
6206
5677
__attribute__((unused))
6207
5678
gconstpointer user_data){
6208
5679
__attribute__((cleanup(cleanup_close)))
6209
const int epoll_fd = open("/dev/null",
6210
O_WRONLY | O_CLOEXEC | O_NOCTTY);
5680
const int epoll_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);
6211
5681
__attribute__((cleanup(cleanup_string)))
6212
5682
char *const question_filename = strdup("/nonexistent/question");
6213
5683
g_assert_nonnull(question_filename);
6476
5946
const char *const
6477
5947
dirname){
6478
5948
__attribute__((cleanup(cleanup_close)))
6479
const int devnull_fd = open("/dev/null",
6480
O_WRONLY | O_CLOEXEC | O_NOCTTY);
5949
const int devnull_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);
6481
5950
g_assert_cmpint(devnull_fd, >=, 0);
6482
5951
__attribute__((cleanup(cleanup_close)))
6483
5952
const int real_stderr_fd = dup(STDERR_FILENO);
8026
7495
test_add("/parse_arguments/mixed", test_parse_arguments_mixed);
8027
7496
test_add("/queue/create", test_create_queue);
8028
7497
test_add("/queue/add", test_add_to_queue);
8029
test_add("/queue/add/overflow", test_add_to_queue_overflow);
8030
7498
test_add("/queue/has_question/empty",
8031
7499
test_queue_has_question_empty);
8032
7500
test_add("/queue/has_question/false",
8119
7587
test_add_inotify_dir_watch);
8120
7588
test_add_st("/task-creators/add_inotify_dir_watch/fail",
8121
7589
test_add_inotify_dir_watch_fail);
8122
test_add_st("/task-creators/add_inotify_dir_watch/not-a-directory",
8123
test_add_inotify_dir_watch_nondir);
8124
7590
test_add_st("/task-creators/add_inotify_dir_watch/EAGAIN",
8125
7591
test_add_inotify_dir_watch_EAGAIN);
8126
7592
test_add_st("/task-creators/add_inotify_dir_watch/IN_CLOSE_WRITE",
8127
7593
test_add_inotify_dir_watch_IN_CLOSE_WRITE);
8128
7594
test_add_st("/task-creators/add_inotify_dir_watch/IN_MOVED_TO",
8129
7595
test_add_inotify_dir_watch_IN_MOVED_TO);
8130
test_add_st("/task-creators/add_inotify_dir_watch/IN_MOVED_FROM",
8131
test_add_inotify_dir_watch_IN_MOVED_FROM);
8132
test_add_st("/task-creators/add_inotify_dir_watch/IN_EXCL_UNLINK",
8133
test_add_inotify_dir_watch_IN_EXCL_UNLINK);
8134
7596
test_add_st("/task-creators/add_inotify_dir_watch/IN_DELETE",
8135
7597
test_add_inotify_dir_watch_IN_DELETE);
8136
7598
test_add_st("/task/read_inotify_event/readerror",
8145
7607
test_read_inotify_event_IN_CLOSE_WRITE);
8146
7608
test_add_st("/task/read_inotify_event/IN_MOVED_TO",
8147
7609
test_read_inotify_event_IN_MOVED_TO);
8148
test_add_st("/task/read_inotify_event/IN_MOVED_FROM",
8149
test_read_inotify_event_IN_MOVED_FROM);
8150
7610
test_add_st("/task/read_inotify_event/IN_DELETE",
8151
7611
test_read_inotify_event_IN_DELETE);
8152
7612
test_add_st("/task/read_inotify_event/IN_CLOSE_WRITE/badname",
8153
7613
test_read_inotify_event_IN_CLOSE_WRITE_badname);
8154
7614
test_add_st("/task/read_inotify_event/IN_MOVED_TO/badname",
8155
7615
test_read_inotify_event_IN_MOVED_TO_badname);
8156
test_add_st("/task/read_inotify_event/IN_MOVED_FROM/badname",
8157
test_read_inotify_event_IN_MOVED_FROM_badname);
8158
7616
test_add_st("/task/read_inotify_event/IN_DELETE/badname",
8159
7617
test_read_inotify_event_IN_DELETE_badname);
8160
7618
test_add_st("/task/open_and_parse_question/ENOENT",
8257
7715
g_option_context_set_help_enabled(context, FALSE);
8258
7716
g_option_context_set_ignore_unknown_options(context, TRUE);
8259
7717
8260
gboolean should_run_tests = FALSE;
7718
gboolean run_tests = FALSE;
8261
7719
GOptionEntry entries[] = {
8262
7720
{ "test", 0, 0, G_OPTION_ARG_NONE,
8263
&should_run_tests, "Run tests", NULL },
7721
&run_tests, "Run tests", NULL },
8264
7722
{ NULL }
8265
7723
};
8266
7724
g_option_context_add_main_entries(context, entries, NULL);
8273
7731
}
8274
7732
8275
7733
g_option_context_free(context);
8276
return should_run_tests != FALSE;
7734
return run_tests != FALSE;
8277
7735
}
8278
8279
/*
8280
Local Variables:
8281
run-tests:
8282
(lambda ()
8283
(if (not (funcall run-tests-in-test-buffer default-directory))
8284
(funcall show-test-buffer-in-test-window)
8285
(funcall remove-test-window)))
8286
run-tests-in-test-buffer:
8287
(lambda (dir)
8288
(with-current-buffer (get-buffer-create "*Test*")
8289
(setq buffer-read-only nil
8290
default-directory dir)
8291
(erase-buffer)
8292
(compilation-mode))
8293
(let ((process-result
8294
(let ((inhibit-read-only t))
8295
(process-file-shell-command
8296
(funcall get-command-line) nil "*Test*"))))
8297
(and (numberp process-result)
8298
(= process-result 0))))
8299
get-command-line:
8300
(lambda ()
8301
(let*
8302
((build-directory
8303
(funcall find-build-directory (buffer-file-name)))
8304
(local-build-directory
8305
(if (fboundp 'file-local-name)
8306
(file-local-name build-directory)
8307
(or (file-remote-p build-directory 'localname)
8308
build-directory)))
8309
(command
8310
(file-relative-name (file-name-sans-extension
8311
(buffer-file-name)) build-directory))
8312
(qbdir (shell-quote-argument local-build-directory))
8313
(qcmd (shell-quote-argument command)))
8314
(format (concat "cd %s && CFLAGS=-Werror make --silent %s"
8315
" && %s --test --verbose") qbdir qcmd qcmd)))
8316
find-build-directory:
8317
(lambda (try-directory &optional base-directory)
8318
(let ((base-directory (or base-directory try-directory)))
8319
(cond ((equal try-directory "/") base-directory)
8320
((file-readable-p
8321
(concat (file-name-as-directory try-directory)
8322
"Makefile")) try-directory)
8323
((funcall find-build-directory
8324
(directory-file-name (file-name-directory
8325
try-directory))
8326
base-directory)))))
8327
show-test-buffer-in-test-window:
8328
(lambda ()
8329
(when (not (get-buffer-window-list "*Test*"))
8330
(setq next-error-last-buffer (get-buffer "*Test*"))
8331
(let* ((side (if (>= (window-width) 146) 'right 'bottom))
8332
(display-buffer-overriding-action
8333
`((display-buffer-in-side-window) (side . ,side)
8334
(window-height . fit-window-to-buffer)
8335
(window-width . fit-window-to-buffer))))
8336
(display-buffer "*Test*"))))
8337
remove-test-window:
8338
(lambda ()
8339
(let ((test-window (get-buffer-window "*Test*")))
8340
(if test-window (delete-window test-window))))
8341
eval: (add-hook 'after-save-hook run-tests 90 t)
8342
End:
8343
*/
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0