/mandos/trunk : revision 1237

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

Committer: Teddy Hogeborn
Date: 2021-02-03 23:10:42 UTC
Revision ID: teddy@recompile.se-20210203231042-2z3egrvpo1zt7nej

mandos-ctl: Fix bad test for command.Remove and related minor issues

The test for command.Remove removes all clients from the spy server,
and then loops over all clients, looking for the corresponding Remove
command as recorded by the spy server.  But since since there aren't
any clients left after they were removed, no assertions are made, and
the test therefore does nothing.  Fix this.

In tests for command.Approve and command.Deny, add checks that clients
were not somehow removed by the command (in which case, likewise, no
assertions are made).

Add related checks to TestPropertySetterCmd.runTest; i.e. test that a
sequence is not empty before looping over it and making assertions.

* mandos-ctl (TestBaseCommands.test_Remove): Save a copy of the
  original "clients" dict, and loop over those instead.  Add assertion
  that all clients were indeed removed.  Also fix the code which looks
  for the Remove command, which now needs to actually work.
  (TestBaseCommands.test_Approve, TestBaseCommands.test_Deny): Add
  assertion that there are still clients before looping over them.
  (TestPropertySetterCmd.runTest): Add assertion that the list of
  values to get is not empty before looping over them.  Also add check
  that there are still clients before looping over clients.

Show diffs side-by-side

added added

removed removed

dracut-module/password-agent.c

/* -*- coding: utf-8; lexical-binding: t -*- */

/* -*- 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)))))); -*- */

* Mandos password agent - Simple password agent to run Mandos client

* This file is part of Mandos.

1098

} ievent_buffer;

1099

struct inotify_event *const ievent = &ievent_buffer.event;

1100

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

1101

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

1102

if(read_length == 0){ /* EOF */

1111

1103

error(0, 0, "Got EOF from inotify fd for directory %s", filename);

1112

1104

*quit_now = true;

4190

4182

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4191

4183

const size_t ievent_size = (sizeof(struct inotify_event)

4192

4184

+ 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

4185

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4199

4186

==, ievent_size);

4200

#if defined(__GNUC__) and __GNUC__ >= 11

4201

#pragma GCC diagnostic pop

4202

#endif

4203

4187

g_assert_cmpint(close(pipefds[1]), ==, 0);

4204

4188

4205

4189

bool quit_now = false;

4293

4277

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4294

4278

const size_t ievent_size = (sizeof(struct inotify_event)

4295

4279

+ 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

4280

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4302

4281

==, ievent_size);

4303

#if defined(__GNUC__) and __GNUC__ >= 11

4304

#pragma GCC diagnostic pop

4305

#endif

4306

4282

g_assert_cmpint(close(pipefds[1]), ==, 0);

4307

4283

4308

4284

bool quit_now = false;

4398

4374

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4399

4375

const size_t ievent_size = (sizeof(struct inotify_event)

4400

4376

+ 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

4377

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4407

4378

==, ievent_size);

4408

#if defined(__GNUC__) and __GNUC__ >= 11

4409

#pragma GCC diagnostic pop

4410

#endif

4411

4379

g_assert_cmpint(close(pipefds[1]), ==, 0);

4412

4380

4413

4381

bool quit_now = false;

4491

4459

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4492

4460

const size_t ievent_size = (sizeof(struct inotify_event)

4493

4461

+ 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

4462

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4500

4463

==, ievent_size);

4501

#if defined(__GNUC__) and __GNUC__ >= 11

4502

#pragma GCC diagnostic pop

4503

#endif

4504

4464

g_assert_cmpint(close(pipefds[1]), ==, 0);

4505

4465

4506

4466

bool quit_now = false;

4583

4543

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4584

4544

const size_t ievent_size = (sizeof(struct inotify_event)

4585

4545

+ 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

4546

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4592

4547

==, ievent_size);

4593

#if defined(__GNUC__) and __GNUC__ >= 11

4594

#pragma GCC diagnostic pop

4595

#endif

4596

4548

g_assert_cmpint(close(pipefds[1]), ==, 0);

4597

4549

4598

4550

bool quit_now = false;

4667

4619

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4668

4620

const size_t ievent_size = (sizeof(struct inotify_event)

4669

4621

+ 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

4622

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4676

4623

==, ievent_size);

4677

#if defined(__GNUC__) and __GNUC__ >= 11

4678

#pragma GCC diagnostic pop

4679

#endif

4680

4624

g_assert_cmpint(close(pipefds[1]), ==, 0);

4681

4625

4682

4626

bool quit_now = false;

4754

4698

memcpy(ievent->name, dummy_file_name, sizeof(dummy_file_name));

4755

4699

const size_t ievent_size = (sizeof(struct inotify_event)

4756

4700

+ 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

4701

g_assert_cmpint(write(pipefds[1], (char *)ievent, ievent_size),

4763

4702

==, ievent_size);

4764

#if defined(__GNUC__) and __GNUC__ >= 11

4765

#pragma GCC diagnostic pop

4766

#endif

4767

4703

g_assert_cmpint(close(pipefds[1]), ==, 0);

4768

4704

4769

4705

bool quit_now = false;

6069

6005

if(ssret < 0){

6070

6006

if(saved_errno != EMSGSIZE) {

6071

6007

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));

6008

g_test_message("Error on send(): %s", strerror(saved_errno));

6075

6009

return;

6076

6010

}

6077

6011

break;

8259

8193

g_option_context_free(context);

8260

8194

return should_run_tests != FALSE;

8261

8195

}

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

Older »