/mandos/trunk : revision 1154

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: 2019-08-10 15:19:47 UTC
Revision ID: teddy@recompile.se-20190810151947-wyw7cetrh1pvtw37

Simplification of Python 3 compatibility code

Normally, "class Foo:" in Python 2 creates a "classic" class, but in
Python 3, all classes are "new-style" classes, which you can get in
Python 2 by doing "class Foo(object):", i.e. inheriting from "object".
But, you can also get a new-style classes from "class Foo:" in Python
2 by setting the global "__metaclass__" variable to "type", which
makes the code less cluttered. Note: it is still necessary to inherit
from "object" in Python 2 to get a new-style class if the class is
otherwise inheriting only from "classic" classes.

* mandos: Set "__metaclass__ = type" globally for Python 2, and remove
inheriting from "object" in all places possible.
* mandos-ctl: - '' -

Show diffs side-by-side

added added

removed removed

dracut-module/password-agent.c

#include <error.h> /* error() */

#include <sysexits.h> /* EX_USAGE, EX_OSERR, EX_OSFILE */

#include <errno.h> /* errno, error_t, EACCES,

ENAMETOOLONG, ENOENT, EEXIST,

ECHILD, EPERM, ENOMEM, EAGAIN,

EINTR, ENOBUFS, EADDRINUSE,

ENAMETOOLONG, ENOENT, ENOTDIR,

EEXIST, ECHILD, EPERM, ENOMEM,

EAGAIN, EINTR, ENOBUFS, EADDRINUSE,

ECONNREFUSED, ECONNRESET,

ETOOMANYREFS, EMSGSIZE, EBADF,

EINVAL */

#include <sys/mman.h> /* munlock(), mlock() */

#include <fcntl.h> /* O_CLOEXEC, O_NONBLOCK, fcntl(),

F_GETFD, F_GETFL, FD_CLOEXEC,

open(), O_WRONLY, O_RDONLY */

open(), O_WRONLY, O_NOCTTY,

O_RDONLY, O_NOFOLLOW */

#include <sys/wait.h> /* waitpid(), WNOHANG, WIFEXITED(),

WEXITSTATUS() */

#include <limits.h> /* PIPE_BUF, NAME_MAX, INT_MAX */

#include <sys/inotify.h> /* inotify_init1(), IN_NONBLOCK,

IN_CLOEXEC, inotify_add_watch(),

IN_CLOSE_WRITE, IN_MOVED_TO,

IN_DELETE, struct inotify_event */

IN_MOVED_FROM, IN_DELETE,

IN_EXCL_UNLINK, IN_ONLYDIR,

struct inotify_event */

#include <fnmatch.h> /* fnmatch(), FNM_FILE_NAME */

#include <stdio.h> /* asprintf(), FILE, fopen(),

getline(), sscanf(), feof(),

431

434

case EACCES:

432

435

case ENAMETOOLONG:

433

436

case ENOENT:

437

case ENOTDIR:

434

438

return EX_OSFILE;

435

439

default:

436

440

return EX_OSERR;

1018

1022

}

1019

1023

1020

1024

if(inotify_add_watch(fd, dir, IN_CLOSE_WRITE | IN_MOVED_TO

1021

| IN_MOVED_FROM| IN_DELETE | IN_EXCL_UNLINK)

1025

| IN_MOVED_FROM| IN_DELETE | IN_EXCL_UNLINK

1026

| IN_ONLYDIR)

1022

1027

== -1){

1023

1028

error(0, errno, "Failed to create inotify watch on %s", dir);

1024

1029

return false;

2222

2227

2223

2228

{

2224

2229

__attribute__((cleanup(cleanup_close)))

2225

const int devnull_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);

2230

const int devnull_fd = open("/dev/null",

2231

O_WRONLY | O_CLOEXEC | O_NOCTTY);

2226

2232

g_assert_cmpint(devnull_fd, >=, 0);

2227

2233

__attribute__((cleanup(cleanup_close)))

2228

2234

const int real_stderr_fd = dup(STDERR_FILENO);

2252

2258

{

2253

2259

__attribute__((cleanup(cleanup_close)))

2254

2260

const int devnull_fd = open("/dev/null",

2255

O_WRONLY | O_CLOEXEC);

2261

O_WRONLY | O_CLOEXEC | O_NOCTTY);

2256

2262

g_assert_cmpint(devnull_fd, >=, 0);

2257

2263

__attribute__((cleanup(cleanup_close)))

2258

2264

const int real_stderr_fd = dup(STDERR_FILENO);

2903

2909

2904

2910

__attribute__((cleanup(cleanup_close)))

2905

2911

const int devnull_fd = open("/dev/null",

2906

O_WRONLY | O_CLOEXEC);

2912

O_WRONLY | O_CLOEXEC | O_NOCTTY);

2907

2913

g_assert_cmpint(devnull_fd, >=, 0);

2908

2914

__attribute__((cleanup(cleanup_close)))

2909

2915

const int real_stderr_fd = dup(STDERR_FILENO);

2974

2980

2975

2981

__attribute__((cleanup(cleanup_close)))

2976

2982

const int devnull_fd = open("/dev/null",

2977

O_WRONLY | O_CLOEXEC);

2983

O_WRONLY | O_CLOEXEC, O_NOCTTY);

2978

2984

g_assert_cmpint(devnull_fd, >=, 0);

2979

2985

__attribute__((cleanup(cleanup_close)))

2980

2986

const int real_stderr_fd = dup(STDERR_FILENO);

3018

3024

buffer password = {};

3019

3025

3020

3026

/* Reading /proc/self/mem from offset 0 will always give EIO */

3021

const int fd = open("/proc/self/mem", O_RDONLY | O_CLOEXEC);

3027

const int fd = open("/proc/self/mem",

3028

O_RDONLY | O_CLOEXEC | O_NOCTTY);

3022

3029

3023

3030

bool password_is_read = false;

3024

3031

bool quit_now = false;

3452

3459

g_assert_cmpuint((unsigned int)queue->length, ==, 0);

3453

3460

}

3454

3461

3462

static void test_add_inotify_dir_watch_nondir(__attribute__((unused))

3463

test_fixture *fixture,

3464

__attribute__((unused))

3465

gconstpointer

3466

user_data){

3467

__attribute__((cleanup(cleanup_close)))

3468

const int epoll_fd = epoll_create1(EPOLL_CLOEXEC);

3469

g_assert_cmpint(epoll_fd, >=, 0);

3470

__attribute__((cleanup(cleanup_queue)))

3471

task_queue *queue = create_queue();

3472

g_assert_nonnull(queue);

3473

__attribute__((cleanup(string_set_clear)))

3474

string_set cancelled_filenames = {};

3475

const mono_microsecs current_time = 0;

3476

3477

bool quit_now = false;

3478

buffer password = {};

3479

bool mandos_client_exited = false;

3480

bool password_is_read = false;

3481

3482

const char not_a_directory[] = "/dev/tty";

3483

3484

FILE *real_stderr = stderr;

3485

FILE *devnull = fopen("/dev/null", "we");

3486

g_assert_nonnull(devnull);

3487

stderr = devnull;

3488

g_assert_false(add_inotify_dir_watch(queue, epoll_fd, &quit_now,

3489

&password, not_a_directory,

3490

&cancelled_filenames,

3491

&current_time,

3492

&mandos_client_exited,

3493

&password_is_read));

3494

stderr = real_stderr;

3495

g_assert_cmpint(fclose(devnull), ==, 0);

3496

3497

g_assert_cmpuint((unsigned int)queue->length, ==, 0);

3498

}

3499

3455

3500

static void test_add_inotify_dir_watch_EAGAIN(__attribute__((unused))

3456

3501

test_fixture *fixture,

3457

3502

__attribute__((unused))

3894

3939

const mono_microsecs current_time = 0;

3895

3940

3896

3941

/* Reading /proc/self/mem from offset 0 will always result in EIO */

3897

const int fd = open("/proc/self/mem", O_RDONLY | O_CLOEXEC);

3942

const int fd = open("/proc/self/mem",

3943

O_RDONLY | O_CLOEXEC | O_NOCTTY);

3898

3944

3899

3945

bool quit_now = false;

3900

3946

__attribute__((cleanup(cleanup_queue)))

5585

5631

__attribute__((unused))

5586

5632

gconstpointer user_data){

5587

5633

__attribute__((cleanup(cleanup_close)))

5588

const int epoll_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);

5634

const int epoll_fd = open("/dev/null",

5635

O_WRONLY | O_CLOEXEC | O_NOCTTY);

5589

5636

__attribute__((cleanup(cleanup_string)))

5590

5637

char *const question_filename = strdup("/nonexistent/question");

5591

5638

g_assert_nonnull(question_filename);

5995

6042

__attribute__((unused))

5996

6043

gconstpointer user_data){

5997

6044

__attribute__((cleanup(cleanup_close)))

5998

const int epoll_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);

6045

const int epoll_fd = open("/dev/null",

6046

O_WRONLY | O_CLOEXEC | O_NOCTTY);

5999

6047

__attribute__((cleanup(cleanup_string)))

6000

6048

char *const question_filename = strdup("/nonexistent/question");

6001

6049

g_assert_nonnull(question_filename);

6264

6312

const char *const

6265

6313

dirname){

6266

6314

__attribute__((cleanup(cleanup_close)))

6267

const int devnull_fd = open("/dev/null", O_WRONLY | O_CLOEXEC);

6315

const int devnull_fd = open("/dev/null",

6316

O_WRONLY | O_CLOEXEC | O_NOCTTY);

6268

6317

g_assert_cmpint(devnull_fd, >=, 0);

6269

6318

__attribute__((cleanup(cleanup_close)))

6270

6319

const int real_stderr_fd = dup(STDERR_FILENO);

7905

7954

test_add_inotify_dir_watch);

7906

7955

test_add_st("/task-creators/add_inotify_dir_watch/fail",

7907

7956

test_add_inotify_dir_watch_fail);

7957

test_add_st("/task-creators/add_inotify_dir_watch/not-a-directory",

7958

test_add_inotify_dir_watch_nondir);

7908

7959

test_add_st("/task-creators/add_inotify_dir_watch/EAGAIN",

7909

7960

test_add_inotify_dir_watch_EAGAIN);

7910

7961

test_add_st("/task-creators/add_inotify_dir_watch/IN_CLOSE_WRITE",

Older »