nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-mesh-vpn-fastd: in respondd provider use pubkey_privacy setting from site instead of uci

Browse Source
This commit is contained in:
Martin Weinelt 2018-02-04 01:32:02 +01:00
parent e1a4f8afe7
commit d079387225
No known key found for this signature in database
GPG Key ID: BD4AA0528F63F17E
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd
View File

@ -44,7 +44,6 @@ uci:section('fastd', 'fastd', 'mesh_vpn', {
method = methods, method = methods,
packet_mark = 1, packet_mark = 1,
status_socket = '/var/run/fastd.mesh_vpn.socket', status_socket = '/var/run/fastd.mesh_vpn.socket',
pubkey_privacy = site.mesh_vpn.pubkey_privacy(true),
}) })
uci:delete('fastd', 'mesh_vpn', 'user') uci:delete('fastd', 'mesh_vpn', 'user')

33
package/gluon-mesh-vpn-fastd/src/respondd.c
View File

@ -96,14 +96,35 @@ static struct json_object * get_fastd_public_key(void) {
line = NULL; line = NULL;
} }
struct json_objcet *ret = gluonutil_wrap_string(line); return gluonutil_wrap_and_free_string(line);
free(line); }
static bool get_pubkey_privacy(void) {
bool ret = true;
struct json_object *site = NULL;
site = gluonutil_load_site_config();
if (!site)
goto end;
struct json_object *mesh_vpn;
if (!json_object_object_get_ex(site, "mesh_vpn", &mesh_vpn))
goto end;
struct json_object *pubkey_privacy;
if (!json_object_object_get_ex(mesh_vpn, "pubkey_privacy", &pubkey_privacy))
goto end;
ret = json_object_get_boolean(pubkey_privacy);
end:
json_object_put(site);
return ret; return ret;
} }
static struct json_object * get_fastd(void) { static struct json_object * get_fastd(void) {
bool enabled = false; bool enabled = false;
bool pubkey_privacy = true;
struct json_object *ret = json_object_new_object(); struct json_object *ret = json_object_new_object();
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
@ -123,17 +144,13 @@ static struct json_object * get_fastd(void) {
if (!enabled_str || !strcmp(enabled_str, "1")) if (!enabled_str || !strcmp(enabled_str, "1"))
enabled = true; enabled = true;
const char *pubkey_privacy_str = uci_lookup_option_string(ctx, s, "pubkey_privacy");
if (pubkey_privacy_str && !strcmp(pubkey_privacy_str, "0"))
pubkey_privacy = false;
disabled: disabled:
uci_free_context(ctx); uci_free_context(ctx);
disabled_nofree: disabled_nofree:
json_object_object_add(ret, "version", get_fastd_version()); json_object_object_add(ret, "version", get_fastd_version());
json_object_object_add(ret, "enabled", json_object_new_boolean(enabled)); json_object_object_add(ret, "enabled", json_object_new_boolean(enabled));
if (enabled && !pubkey_privacy) if (enabled && !get_pubkey_privacy())
json_object_object_add(ret, "public_key", get_fastd_public_key()); json_object_object_add(ret, "public_key", get_fastd_public_key());
return ret; return ret;
} }