RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new Neat VNC authentication API

pull/143/merge
Andri Yngvason 2023-09-29 19:34:42 +00:00
parent 8395f7b106
commit f2c367f191
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/cfg.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020 Andri Yngvason * Copyright (c) 2020 - 2023 Andri Yngvason
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -21,6 +21,7 @@
#define X_CFG_LIST \ #define X_CFG_LIST \
X(bool, enable_auth) \ X(bool, enable_auth) \
X(bool, relax_encryption) \
X(string, private_key_file) \ X(string, private_key_file) \
X(string, certificate_file) \ X(string, certificate_file) \
X(string, rsa_private_key_file) \ X(string, rsa_private_key_file) \

21
src/main.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019 - 2022 Andri Yngvason * Copyright (c) 2019 - 2023 Andri Yngvason
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -740,13 +740,21 @@ int init_nvnc(struct wayvnc* self, const char* addr, uint16_t port,
nvnc_set_name(self->nvnc, "WayVNC"); nvnc_set_name(self->nvnc, "WayVNC");
enum nvnc_auth_flags auth_flags = 0;
if (self->cfg.enable_auth) { if (self->cfg.enable_auth) {
if (self->cfg.rsa_private_key_file) { auth_flags |= NVNC_AUTH_REQUIRE_AUTH;
if (nvnc_enable_auth2(self->nvnc, on_auth, self) < 0) { }
nvnc_log(NVNC_LOG_ERROR, "Failed to enable RSA authentication"); if (!self->cfg.relax_encryption) {
auth_flags |= NVNC_AUTH_REQUIRE_ENCRYPTION;
}
if (self->cfg.enable_auth) {
if (nvnc_enable_auth(self->nvnc, auth_flags, on_auth, self) < 0) {
nvnc_log(NVNC_LOG_ERROR, "Failed to enable authentication");
goto failure; goto failure;
} }
if (self->cfg.rsa_private_key_file) {
if (nvnc_set_rsa_creds(self->nvnc, self->cfg.rsa_private_key_file) < 0) { if (nvnc_set_rsa_creds(self->nvnc, self->cfg.rsa_private_key_file) < 0) {
nvnc_log(NVNC_LOG_ERROR, "Failed to load RSA credentials"); nvnc_log(NVNC_LOG_ERROR, "Failed to load RSA credentials");
goto failure; goto failure;
@ -754,8 +762,9 @@ int init_nvnc(struct wayvnc* self, const char* addr, uint16_t port,
} }
if (self->cfg.private_key_file) { if (self->cfg.private_key_file) {
int r = nvnc_enable_auth(self->nvnc, self->cfg.private_key_file, int r = nvnc_set_tls_creds(self->nvnc,
self->cfg.certificate_file, on_auth, self); self->cfg.private_key_file,
self->cfg.certificate_file);
if (r < 0) { if (r < 0) {
nvnc_log(NVNC_LOG_ERROR, "Failed to enable TLS authentication"); nvnc_log(NVNC_LOG_ERROR, "Failed to enable TLS authentication");
goto failure; goto failure;