Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

ss: policy: treat policy as filepath if no opening brace

Browse source
This commit is contained in:
Andy Green 2021-01-29 10:07:20 +00:00
parent 403a6591e1
commit dffe96446a
2 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/libwebsockets/lws-context-vhost.h
View file

@ -749,7 +749,11 @@ struct lws_context_creation_info {
#else
const char *pss_policies_json; /**< CONTEXT: point to a string
* containing a JSON description of the secure streams policies. Set
* to NULL if not using Secure Streams. */
* to NULL if not using Secure Streams.
* If the platform supports files and the string does not begin with
* '{', lws treats the string as a filepath to open to get the JSON
* policy.
*/
#endif
const struct lws_ss_plugin **pss_plugins; /**< CONTEXT: point to an array
* of pointers to plugin structs here, terminated with a NULL ptr.

50
lib/secure-streams/policy-json.c
View file

@ -1,7 +1,7 @@
/*
* libwebsockets - small server side websockets and web server implementation
*
* Copyright (C) 2019 - 2020 Andy Green <andy@warmcat.com>
* Copyright (C) 2019 - 2021 Andy Green <andy@warmcat.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -1004,12 +1004,60 @@ lws_ss_policy_parse_abandon(struct lws_context *context)
return 0;
}
#if !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
int
lws_ss_policy_parse_file(struct lws_context *cx, const char *filepath)
{
struct policy_cb_args *args = (struct policy_cb_args *)cx->pol_args;
uint8_t buf[512];
int n, m, fd = lws_open(filepath, LWS_O_RDONLY);
if (fd < 0)
return -1;
do {
n = (int)read(fd, buf, sizeof(buf));
if (n < 0) {
m = -1;
goto bail;
}
m = lejp_parse(&args->jctx, buf, n);
if (m != LEJP_CONTINUE && m < 0) {
lwsl_err("%s: parse failed line %u: %d: %s\n", __func__,
(unsigned int)args->jctx.line, m,
lejp_error_to_string(m));
lws_ss_policy_parse_abandon(cx);
m = -1;
goto bail;
}
if (m != LEJP_CONTINUE)
break;
} while (n);
m = 0;
bail:
close(fd);
return m;
}
#endif
int
lws_ss_policy_parse(struct lws_context *context, const uint8_t *buf, size_t len)
{
struct policy_cb_args *args = (struct policy_cb_args *)context->pol_args;
int m;
#if !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
if (!args->jctx.line && buf[0] != '{') {
puts((const char *)buf);
return lws_ss_policy_parse_file(context, (const char *)buf);
}
#endif
m = lejp_parse(&args->jctx, buf, (int)len);
if (m == LEJP_CONTINUE || m >= 0)
return m;