Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added ability to use websockets transport over unix sockets #2620

Merged
merged 1 commit into from
Apr 13, 2021
+88 −0
Merged

Added ability to use websockets transport over unix sockets #2620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions conf/janus.transport.websockets.jcfg.sample
View file
Original file line number Diff line number Diff line change
@@ -11,10 +11,12 @@ general: {
ws_port = 8188 # WebSockets server port
#ws_interface = "eth0" # Whether we should bind this server to a specific interface only
#ws_ip = "192.168.0.1" # Whether we should bind this server to a specific IP address only
#ws_unix = "/run/ws.sock" # Use WebSocket server over UNIX socket instead of TCP
wss = false # Whether to enable secure WebSockets
#wss_port = 8989 # WebSockets server secure port, if enabled
#wss_interface = "eth0" # Whether we should bind this server to a specific interface only
#wss_ip = "192.168.0.1" # Whether we should bind this server to a specific IP address only
#wss_unix = "/run/wss.sock" # Use WebSocket server over UNIX socket instead of TCP
#ws_logging = "err,warn" # libwebsockets debugging level as a comma separated list of things
# to debug, supported values: err, warn, notice, info, debug, parser,
# header, ext, client, latency, user, count (plus 'none' and 'all')
@@ -30,10 +32,12 @@ admin: {
admin_ws_port = 7188 # Admin API WebSockets server port, if enabled
#admin_ws_interface = "eth0" # Whether we should bind this server to a specific interface only
#admin_ws_ip = "192.168.0.1" # Whether we should bind this server to a specific IP address only
#admin_ws_unix = "/run/aws.sock" # Use WebSocket server over UNIX socket instead of TCP
admin_wss = false # Whether to enable the Admin API secure WebSockets
#admin_wss_port = 7989 # Admin API WebSockets server secure port, if enabled
#admin_wss_interface = "eth0" # Whether we should bind this server to a specific interface only
#admin_wss_ip = "192.168.0.1" # Whether we should bind this server to a specific IP address only
#admin_wss_unix = "/run/awss.sock" # Use WebSocket server over UNIX socket instead of TCP
#admin_ws_acl = "127.,192.168.0." # Only allow requests coming from this comma separated list of addresses
}

84 changes: 84 additions & 0 deletions transports/janus_websockets.c
View file
Original file line number Diff line number Diff line change
@@ -632,11 +632,25 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
}
ip = iface;
}
item = janus_config_get(config, config_general, janus_config_type_item, "ws_unix");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
char *unixpath = NULL;
if(item && item->value)
unixpath = (char *)item->value;
#else
if(item && item->value)
JANUS_LOG(LOG_WARN, "WebSockets option 'ws_unix' is not supported because libwebsockets compiled without UNIX sockets\n");
#endif
/* Prepare context */
struct lws_context_creation_info info;
memset(&info, 0, sizeof info);
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
info.port = unixpath ? 0 : wsport;
info.iface = unixpath ? unixpath : (ip ? ip : interface);
#else
info.port = wsport;
info.iface = ip ? ip : interface;
#endif
info.protocols = ws_protocols;
info.extensions = NULL;
info.ssl_cert_filepath = NULL;
@@ -651,6 +665,10 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
ipv4_only = 0;
}
#endif
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
if (unixpath)
info.options |= LWS_SERVER_OPTION_UNIX_SOCK;
#endif
#if (LWS_LIBRARY_VERSION_MAJOR == 3 && LWS_LIBRARY_VERSION_MINOR >= 2) || (LWS_LIBRARY_VERSION_MAJOR > 3)
info.options |= LWS_SERVER_OPTION_FAIL_UPON_UNABLE_TO_BIND;

@@ -659,6 +677,10 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
wss = lws_create_vhost(wsc, &info);
if(wss == NULL) {
JANUS_LOG(LOG_FATAL, "Error creating vhost for WebSockets server...\n");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
} else if (unixpath) {
JANUS_LOG(LOG_INFO, "WebSockets server started (UNIX socket %s)...\n", unixpath);
#endif
} else {
JANUS_LOG(LOG_INFO, "WebSockets server started (port %d)...\n", wsport);
}
@@ -693,6 +715,15 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
}
ip = iface;
}
item = janus_config_get(config, config_general, janus_config_type_item, "wss_unix");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
char *unixpath = NULL;
if(item && item->value)
unixpath = (char *)item->value;
#else
if(item && item->value)
JANUS_LOG(LOG_WARN, "WebSockets option 'wss_unix' is not supported because libwebsockets compiled without UNIX sockets\n");
#endif
item = janus_config_get(config, config_certs, janus_config_type_item, "cert_pem");
if(!item || !item->value) {
JANUS_LOG(LOG_FATAL, "Missing certificate/key path\n");
@@ -714,8 +745,13 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
/* Prepare secure context */
struct lws_context_creation_info info;
memset(&info, 0, sizeof info);
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
info.port = unixpath ? 0 : wsport;
info.iface = unixpath ? unixpath : (ip ? ip : interface);
#else
info.port = wsport;
info.iface = ip ? ip : interface;
#endif
info.protocols = sws_protocols;
info.extensions = NULL;
info.ssl_cert_filepath = server_pem;
@@ -734,11 +770,19 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
ipv4_only = 0;
}
#endif
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
if(unixpath)
info.options |= LWS_SERVER_OPTION_UNIX_SOCK;
#endif
/* Create the secure WebSocket context */
swss = lws_create_vhost(wsc, &info);
if(swss == NULL) {
JANUS_LOG(LOG_FATAL, "Error creating vhost for Secure WebSockets server...\n");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
} else if (unixpath) {
JANUS_LOG(LOG_INFO, "Secure WebSockets server started (UNIX socket %s)...\n", unixpath);
#endif
} else {
JANUS_LOG(LOG_INFO, "Secure WebSockets server started (port %d)...\n", wsport);
}
@@ -775,11 +819,25 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
}
ip = iface;
}
item = janus_config_get(config, config_general, janus_config_type_item, "admin_ws_unix");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
char *unixpath = NULL;
if(item && item->value)
unixpath = (char *)item->value;
#else
if(item && item->value)
JANUS_LOG(LOG_WARN, "WebSockets option 'admin_ws_unix' is not supported because libwebsockets compiled without UNIX sockets\n");
#endif
/* Prepare context */
struct lws_context_creation_info info;
memset(&info, 0, sizeof info);
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
info.port = unixpath ? 0 : wsport;
info.iface = unixpath ? unixpath : (ip ? ip : interface);
#else
info.port = wsport;
info.iface = ip ? ip : interface;
#endif
info.protocols = admin_ws_protocols;
info.extensions = NULL;
info.ssl_cert_filepath = NULL;
@@ -802,6 +860,10 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
admin_wss = lws_create_vhost(wsc, &info);
if(admin_wss == NULL) {
JANUS_LOG(LOG_FATAL, "Error creating vhost for Admin WebSockets server...\n");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
} else if (unixpath) {
JANUS_LOG(LOG_INFO, "Admin WebSockets server started (UNIX socket %s)...\n", unixpath);
#endif
} else {
JANUS_LOG(LOG_INFO, "Admin WebSockets server started (port %d)...\n", wsport);
}
@@ -836,6 +898,15 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
}
ip = iface;
}
item = janus_config_get(config, config_general, janus_config_type_item, "admin_wss_unix");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
char *unixpath = NULL;
if(item && item->value)
unixpath = (char *)item->value;
#else
if(item && item->value)
JANUS_LOG(LOG_WARN, "WebSockets option 'admin_wss_unix' is not supported because libwebsockets compiled without UNIX sockets\n");
#endif
item = janus_config_get(config, config_certs, janus_config_type_item, "cert_pem");
if(!item || !item->value) {
JANUS_LOG(LOG_FATAL, "Missing certificate/key path\n");
@@ -857,8 +928,13 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
/* Prepare secure context */
struct lws_context_creation_info info;
memset(&info, 0, sizeof info);
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
info.port = unixpath ? 0 : wsport;
info.iface = unixpath ? unixpath : (ip ? ip : interface);
#else
info.port = wsport;
info.iface = ip ? ip : interface;
#endif
info.protocols = admin_sws_protocols;
info.extensions = NULL;
info.ssl_cert_filepath = server_pem;
@@ -877,11 +953,19 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
ipv4_only = 0;
}
#endif
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
if (unixpath)
info.options |= LWS_SERVER_OPTION_UNIX_SOCK;
#endif
/* Create the secure WebSocket context */
admin_swss = lws_create_vhost(wsc, &info);
if(admin_swss == NULL) {
JANUS_LOG(LOG_FATAL, "Error creating vhost for Secure Admin WebSockets server...\n");
#if defined(LWS_USE_UNIX_SOCK) || defined(LWS_WITH_UNIX_SOCK)
} else if (unixpath) {
JANUS_LOG(LOG_INFO, "Secure Admin WebSockets server started (UNIX socket %s)...\n", unixpath);
#endif
} else {
JANUS_LOG(LOG_INFO, "Secure Admin WebSockets server started (port %d)...\n", wsport);
}