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

Add cross-origin access on json interface #415

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add cross-origin access on json interface #415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
135b1a4
Add cross-origin access on json interface
Amygos Jan 17, 2018
bc31f81
Add "alloworigin" option documentation
Amygos Jan 17, 2018
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
1 change: 1 addition & 0 deletions src/cmdline.ggo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ option "uamlogoutip" - "HTTP Auto-Logout IP Address" string default="1.0.0.0" n
option "uamaliasip" - "Special IP Address aliased (redirect) to uamlisten/uamport" string default="1.0.0.1" no
option "uamaliasname" - "Special simple hostname (no dots) to be resolved to uamaliasip" string no
option "uamhostname" - "Special simple hostname (no dots) to be resolved to uamlisten" string no
option "alloworigin" - "Allow cross-origin HTTP requests on json interface" string argoptional default="*" no

option "authedallowed" - "Resources exempt from session limitations" string no multiple
option "uamauthedallowed" - "Use uamallowed as resources exempt from session limitations" flag off
Expand Down
9 changes: 9 additions & 0 deletions src/main-opt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,6 +1398,15 @@ int main(int argc, char **argv) {
_options.usestatusfile = STRDUP(args_info.usestatusfile_arg);
_options.uamaliasname = STRDUP(args_info.uamaliasname_arg);
_options.uamhostname = STRDUP(args_info.uamhostname_arg);

if (args_info.alloworigin_given)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you want the if (...) statement in thee #ifdef

Copy link
Author

@Amygos Amygos Jan 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I leave the if (...) statement outside the #ifdef because if someone specify "alloworigin" option without json support will get a warning in syslog. I have mimic the behavior of other case like "proxylisten".

#ifdef ENABLE_JSON
_options.alloworigin = STRDUP(args_info.alloworigin_arg);
#endif
#if(_debug_ && !defined(ENABLE_JSON))
syslog(LOG_WARNING, "JSON not implemented. build with --enable-json");
Copy link
Contributor

@xOneca xOneca Jan 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add to the message which option needs JSON support (i.e. alloworigin). And maybe better error than warn?

#endif

_options.binconfig = STRDUP(args_info.bin_arg);
_options.ethers = STRDUP(args_info.ethers_arg);
#ifdef ENABLE_IEEE8021Q
Expand Down
8 changes: 8 additions & 0 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@ int options_fromfd(int fd, bstring bt) {
if (!option_s_l(bt, &o.uamaliasname)) return 0;
if (!option_s_l(bt, &o.uamhostname)) return 0;

#ifdef ENABLE_JSON
if (!option_s_l(bt, &o.alloworigin)) return 0;
#endif

#ifdef ENABLE_REDIRINJECT
if (!option_s_l(bt, &o.inject)) return 0;
if (!option_s_l(bt, &o.inject_ext)) return 0;
Expand Down Expand Up @@ -561,6 +565,10 @@ int options_save(char *file, bstring bt) {
if (!option_s_s(bt, &o.uamaliasname)) return 0;
if (!option_s_s(bt, &o.uamhostname)) return 0;

#ifdef ENABLE_JSON
if (!option_s_s(bt, &o.alloworigin)) return 0;
#endif

#ifdef ENABLE_REDIRINJECT
if (!option_s_s(bt, &o.inject)) return 0;
if (!option_s_s(bt, &o.inject_ext)) return 0;
Expand Down
4 changes: 4 additions & 0 deletions src/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ struct options_t {
char *uamaliasname; /* Simple hostname (no dots) DNS name for uamalias */
char *uamhostname; /* Simple hostname (no dots) DNS name for uamlisten */

#ifdef ENABLE_JSON
char *alloworigin;
#endif

#ifdef ENABLE_FORCEDNS
struct in_addr forcedns1_addr; /* IP address to force DNS to */
struct in_addr forcedns2_addr; /* IP address to force DNS to */
Expand Down
10 changes: 10 additions & 0 deletions src/redir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,6 +1403,16 @@ static int redir_json_reply(struct redir_t *redir, int res, struct redir_conn_t
bassignformat(tmp , "%d", blength(json));
bconcat(s, tmp);

if (_options.alloworigin) {
if (!strncmp(_options.alloworigin, "*", 1)) {
bcatcstr(s, "\r\nAccess-Control-Allow-Origin: *");
} else {
bassignformat(tmp , "\r\nAccess-Control-Allow-Origin: %s", _options.alloworigin);
bconcat(s, tmp);
bcatcstr(s, "\r\nVary: Origin");
}
}

bcatcstr(s, "\r\nContent-Type: ");
if (tmp->slen) bcatcstr(s, "text/javascript");
else bcatcstr(s, "application/json");
Expand Down