stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

http: access - fix ticked based access

Browse source
This commit is contained in:
Jaroslav Kysela 2014-09-09 16:49:54 +02:00
parent 547369ec18
commit 34edcf8b2e
4 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/access.c
View file

@ -160,6 +160,8 @@ access_ticket_verify(const char *id, const char *resource)
void
access_destroy(access_t *a)
{
if (a == NULL)
return;
free(a->aa_username);
free(a->aa_representative);
htsmsg_destroy(a->aa_dvrcfgs);

32
src/http.c
View file

@ -403,11 +403,14 @@ static int http_access_verify_ticket(http_connection_t *hc)
{
const char *ticket_id = http_arg_get(&hc->hc_req_args, "ticket");
if (hc->hc_ticket)
return 0;
if(!access_ticket_verify(ticket_id, hc->hc_url)) {
char addrstr[50];
tcp_get_ip_str((struct sockaddr*)hc->hc_peer, addrstr, 50);
tvhlog(LOG_INFO, "HTTP", "%s: using ticket %s for %s",
addrstr, ticket_id, hc->hc_url);
hc->hc_ticket = 1;
return 0;
}
return -1;
@ -422,13 +425,12 @@ http_access_verify(http_connection_t *hc, int mask)
if (!http_access_verify_ticket(hc))
return 0;
if (hc->hc_access)
return access_verify2(hc->hc_access, mask);
hc->hc_access = access_get(hc->hc_username, hc->hc_password,
(struct sockaddr *)hc->hc_peer);
if (hc->hc_access == NULL)
return -1;
if (hc->hc_access == NULL) {
hc->hc_access = access_get(hc->hc_username, hc->hc_password,
(struct sockaddr *)hc->hc_peer);
if (hc->hc_access == NULL)
return -1;
}
return access_verify2(hc->hc_access, mask);
}
@ -438,15 +440,22 @@ http_access_verify(http_connection_t *hc, int mask)
*/
int
http_access_verify_channel(http_connection_t *hc, int mask,
struct channel *ch)
struct channel *ch, int ticket)
{
int res = -1;
assert(ch);
if (!http_access_verify_ticket(hc))
if (ticket && !http_access_verify_ticket(hc))
return 0;
if (hc->hc_access == NULL) {
hc->hc_access = access_get(hc->hc_username, hc->hc_password,
(struct sockaddr *)hc->hc_peer);
if (hc->hc_access == NULL)
return -1;
}
if (channel_access(ch, hc->hc_access, hc->hc_username))
res = 0;
return res;
@ -465,12 +474,11 @@ http_exec(http_connection_t *hc, http_path_t *hp, char *remain)
if(http_access_verify(hc, hp->hp_accessmask))
err = HTTP_STATUS_UNAUTHORIZED;
else {
/* FIXME: Recode to obtain access only once */
else
err = hp->hp_callback(hc, remain, hp->hp_opaque);
}
access_destroy(hc->hc_access);
hc->hc_access = NULL;
hc->hc_ticket = 0;
if(err == -1)
return 1;

4
src/http.h
View file

@ -132,6 +132,7 @@ typedef struct http_connection {
char *hc_username;
char *hc_password;
access_t *hc_access;
int hc_ticket;
struct config_head *hc_user_config;
@ -208,7 +209,8 @@ void http_server_register(void);
void http_server_done(void);
int http_access_verify(http_connection_t *hc, int mask);
int http_access_verify_channel(http_connection_t *hc, int mask, struct channel *ch);
int http_access_verify_channel(http_connection_t *hc, int mask,
struct channel *ch, int ticket);
void http_deescape(char *s);

10
src/webui/webui.c
View file

@ -372,7 +372,7 @@ http_channel_playlist(http_connection_t *hc, channel_t *channel)
const char *host;
muxer_container_type_t mc;
if (http_access_verify_channel(hc, ACCESS_STREAMING, channel))
if (http_access_verify_channel(hc, ACCESS_STREAMING, channel, 1))
return HTTP_STATUS_UNAUTHORIZED;
mc = muxer_container_txt2type(http_arg_get(&hc->hc_req_args, "mux"));
@ -438,7 +438,7 @@ http_tag_playlist(http_connection_t *hc, channel_tag_t *tag)
htsbuf_qprintf(hq, "#EXTM3U\n");
LIST_FOREACH(ctm, &tag->ct_ctms, ctm_tag_link) {
if (http_access_verify_channel(hc, ACCESS_STREAMING, ctm->ctm_channel))
if (http_access_verify_channel(hc, ACCESS_STREAMING, ctm->ctm_channel, 0))
continue;
snprintf(buf, sizeof(buf), "/stream/channelid/%d", channel_get_id(ctm->ctm_channel));
htsbuf_qprintf(hq, "#EXTINF:-1,%s\n", channel_get_name(ctm->ctm_channel));
@ -537,7 +537,7 @@ http_channel_list_playlist(http_connection_t *hc)
for (idx = 0; idx < count; idx++) {
ch = chlist[idx];
if (http_access_verify_channel(hc, ACCESS_STREAMING, ch))
if (http_access_verify_channel(hc, ACCESS_STREAMING, ch, 0))
continue;
snprintf(buf, sizeof(buf), "/stream/channelid/%d", channel_get_id(ch));
@ -582,7 +582,7 @@ http_dvr_list_playlist(http_connection_t *hc)
continue;
if (de->de_channel &&
http_access_verify_channel(hc, ACCESS_RECORDER, de->de_channel))
http_access_verify_channel(hc, ACCESS_RECORDER, de->de_channel, 0))
continue;
@ -859,7 +859,7 @@ http_stream_channel(http_connection_t *hc, channel_t *ch, int weight)
const char *name;
char addrbuf[50];
if (http_access_verify_channel(hc, ACCESS_STREAMING, ch))
if (http_access_verify_channel(hc, ACCESS_STREAMING, ch, 1))
return HTTP_STATUS_UNAUTHORIZED;
cfg = dvr_config_find_by_name_default("");