MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-29 05:19:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

[httpd/spotify] Redirect to admin.html, remove old oauth interface

Browse Source
This commit is contained in:
chme
2017-08-28 21:14:35 +02:00
parent e4e5fd5d59
commit ecfea82234
3 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/httpd.c
View File

@@ -154,6 +154,8 @@ static int httpd_port;
struct stream_ctx *g_st;
#endif
static void
redirect_to_admin(struct evhttp_request *req);
static void
stream_end(struct stream_ctx *st, int failed)
@@ -210,24 +212,16 @@ scrobble_cb(void *arg)
static void
oauth_interface(struct evhttp_request *req, const char *uri)
{
struct evbuffer *evbuf;
struct evkeyvalq query;
const char *req_uri;
const char *ptr;
char __attribute__((unused)) redirect_uri[256];
char *errmsg;
int ret;
#ifdef HAVE_SPOTIFY_H
req_uri = evhttp_request_get_uri(req);
evbuf = evbuffer_new();
if (!evbuf)
{
DPRINTF(E_LOG, L_HTTPD, "Could not alloc evbuf for oauth\n");
return;
}
evbuffer_add_printf(evbuf, "<H1>forked-daapd oauth</H1>\n\n");
memset(&query, 0, sizeof(struct evkeyvalq));
ptr = strchr(req_uri, '?');
@@ -236,32 +230,38 @@ oauth_interface(struct evhttp_request *req, const char *uri)
ret = evhttp_parse_query_str(ptr + 1, &query);
if (ret < 0)
{
evbuffer_add_printf(evbuf, "OAuth error: Could not parse parameters in callback (%s)\n", req_uri);
httpd_send_reply(req, HTTP_OK, "OK", evbuf, 0);
evbuffer_free(evbuf);
DPRINTF(E_LOG, L_HTTPD, "OAuth error: Could not parse parameters in callback (%s)\n", req_uri);
httpd_send_error(req, HTTP_BADREQUEST, "Could not parse parameters in callback");
return;
}
}
#ifdef HAVE_SPOTIFY_H
snprintf(redirect_uri, sizeof(redirect_uri), "http://forked-daapd.local:%d/oauth/spotify", httpd_port);
if (strncmp(uri, "/oauth/spotify", strlen("/oauth/spotify")) == 0)
spotify_oauth_callback(evbuf, &query, redirect_uri);
{
snprintf(redirect_uri, sizeof(redirect_uri), "http://forked-daapd.local:%d/oauth/spotify", httpd_port);
ret = spotify_oauth_callback(&query, redirect_uri, &errmsg);
if (ret < 0)
{
DPRINTF(E_LOG, L_HTTPD, "OAuth error: Could not parse parameters in callback (%s)\n", req_uri);
httpd_send_error(req, HTTP_INTERNAL, errmsg);
}
else
{
redirect_to_admin(req);
}
evhttp_clear_headers(&query);
free(errmsg);
}
else
spotify_oauth_interface(evbuf, redirect_uri);
{
httpd_send_error(req, HTTP_NOTFOUND, NULL);
}
#else
evbuffer_add_printf(evbuf, "<p>This version was built without modules requiring OAuth support</p>\n");
DPRINTF(E_LOG, L_HTTPD, "This version was built without modules requiring OAuth support\n");
httpd_send_error(req, HTTP_NOTFOUND, "No modules with OAuth support");
#endif
evbuffer_add_printf(evbuf, "<p><i>(sorry about this ugly interface)</i></p>\n");
evhttp_clear_headers(&query);
httpd_send_reply(req, HTTP_OK, "OK", evbuf, 0);
evbuffer_free(evbuf);
}
static void
@@ -909,6 +909,18 @@ path_is_legal(char *path)
return strncmp(WEB_ROOT, path, strlen(WEB_ROOT));
}
/* Thread: httpd */
static void
redirect_to_admin(struct evhttp_request *req)
{
struct evkeyvalq *headers;
headers = evhttp_request_get_output_headers(req);
evhttp_add_header(headers, "Location", "/admin.html");
httpd_send_reply(req, HTTP_MOVETEMP, "Moved", NULL, HTTPD_SEND_NO_GZIP);
}
/* Thread: httpd */
static void
redirect_to_index(struct evhttp_request *req, char *uri)
@@ -1189,9 +1201,9 @@ httpd_gen_cb(struct evhttp_request *req, void *arg)
}
req_uri = evhttp_request_get_uri(req);
if (!req_uri)
if (!req_uri || strcmp(req_uri, "/") == 0)
{
redirect_to_index(req, "/");
redirect_to_admin(req);
return;
}