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

add option to only allow user to access the tag that matches username

Browse source
This commit is contained in:
amet 2014-03-07 11:05:03 +04:00
parent 342d0e7799
commit 99c34ba238
4 changed files with 105 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/access.c
View file

@ -347,7 +347,22 @@ access_get_by_addr(struct sockaddr *src)
return r;
}
/**
*
*/
uint32_t
access_tag_only(const char *username)
{
access_entry_t *ae;
uint32_t r = 0;
TAILQ_FOREACH(ae, &access_entries, ae_link) {
if(!strcmp(ae->ae_username, username))
return ae->ae_tagonly;
}
return r;
}
/**
@ -568,6 +583,7 @@ access_record_build(access_entry_t *ae)
htsmsg_add_u32(e, "dvrallcfg", ae->ae_rights & ACCESS_RECORDER_ALL ? 1 : 0);
htsmsg_add_u32(e, "webui" , ae->ae_rights & ACCESS_WEB_INTERFACE ? 1 : 0);
htsmsg_add_u32(e, "admin" , ae->ae_rights & ACCESS_ADMIN ? 1 : 0);
htsmsg_add_u32(e, "tag_only" , ae->ae_tagonly);
htsmsg_add_str(e, "id", ae->ae_id);
@ -669,6 +685,9 @@ access_record_update(void *opaque, const char *id, htsmsg_t *values,
if(!htsmsg_get_u32(values, "webui", &u32))
access_update_flag(ae, ACCESS_WEB_INTERFACE, u32);
if(!htsmsg_get_u32(values, "tag_only", &u32))
ae->ae_tagonly = u32;
return access_record_build(ae);
}
@ -740,6 +759,7 @@ access_init(int createdefault, int noacl)
ae->ae_comment = strdup("Default access entry");
ae->ae_enabled = 1;
ae->ae_tagonly = 0;
ae->ae_rights = 0xffffffff;
TAILQ_INIT(&ae->ae_ipmasks);

6
src/access.h
View file

@ -46,6 +46,7 @@ typedef struct access_entry {
char *ae_password;
char *ae_comment;
int ae_enabled;
int ae_tagonly;
uint32_t ae_rights;
@ -113,4 +114,9 @@ uint32_t access_get_by_addr(struct sockaddr *src);
void access_init(int createdefault, int noacl);
void access_done(void);
/**
*
*/
uint32_t access_tag_only(const char *username);
#endif /* ACCESS_H_ */

94
src/htsp_server.c
View file

@ -217,6 +217,7 @@ typedef struct htsp_file {
char *hf_path; // For logging
} htsp_file_t;
static int htsp_user_access_channel(htsp_connection_t *htsp, channel_t *ch);
#define HTSP_DEFAULT_QUEUE_DEPTH 500000
@ -902,9 +903,11 @@ htsp_method_async(htsp_connection_t *htsp, htsmsg_t *in)
htsp_send_message(htsp, htsp_build_tag(ct, "tagAdd", 0), NULL);
/* Send all channels */
CHANNEL_FOREACH(ch)
htsp_send_message(htsp, htsp_build_channel(ch, "channelAdd", htsp), NULL);
CHANNEL_FOREACH(ch) {
if (htsp_user_access_channel(htsp,ch))
htsp_send_message(htsp, htsp_build_channel(ch, "channelAdd", htsp), NULL);
}
/* Send all enabled and external tags (now with channel mappings) */
TAILQ_FOREACH(ct, &channel_tags, ct_link)
if(ct->ct_enabled && !ct->ct_internal)
@ -912,13 +915,16 @@ htsp_method_async(htsp_connection_t *htsp, htsmsg_t *in)
/* Send all DVR entries */
LIST_FOREACH(de, &dvrentries, de_global_link)
htsp_send_message(htsp, htsp_build_dvrentry(de, "dvrEntryAdd"), NULL);
{
if (htsp_user_access_channel(htsp,de->de_channel))
htsp_send_message(htsp, htsp_build_dvrentry(de, "dvrEntryAdd"), NULL);
}
/* Send EPG updates */
if (epg) {
CHANNEL_FOREACH(ch)
RB_FOREACH(ebc, &ch->ch_epg_schedule, sched_link) {
if (epgMaxTime && ebc->start > epgMaxTime) break;
if ((epgMaxTime && ebc->start > epgMaxTime) || !htsp_user_access_channel(htsp,ch)) break;
htsmsg_t *e = htsp_build_event(ebc, "eventAdd", lang, lastUpdate, htsp);
if (e) htsp_send_message(htsp, e, NULL);
}
@ -1377,6 +1383,8 @@ htsp_method_subscribe(htsp_connection_t *htsp, htsmsg_t *in)
} else {
return htsp_error("Missing argument 'channelId' or 'channelName'");
}
if (!htsp_user_access_channel(htsp,ch))
return htsp_error("User not allowed to view this channel");
weight = htsmsg_get_u32_or_default(in, "weight", 150);
req90khz = htsmsg_get_u32_or_default(in, "90khz", 0);
normts = htsmsg_get_u32_or_default(in, "normts", 0);
@ -1687,6 +1695,9 @@ htsp_method_file_open(htsp_connection_t *htsp, htsmsg_t *in)
if(de->de_filename == NULL)
return htsp_error("DVR entry does not have a file yet");
if (!htsp_user_access_channel(htsp,de->de_channel))
return htsp_error("User not allowed to view this recording");
filename = de->de_filename;
return htsp_file_open(htsp, filename, 0);
@ -2303,8 +2314,10 @@ _htsp_channel_update(channel_t *ch, const char *msg)
{
htsp_connection_t *htsp;
LIST_FOREACH(htsp, &htsp_async_connections, htsp_async_link)
if (htsp->htsp_async_mode & HTSP_ASYNC_ON)
{
if (htsp->htsp_async_mode & HTSP_ASYNC_ON & htsp_user_access_channel(htsp,ch))
htsp_send_message(htsp, htsp_build_channel(ch, msg, htsp), NULL);
}
}
void
@ -2367,6 +2380,19 @@ htsp_tag_delete(channel_tag_t *ct)
htsp_async_send(m, HTSP_ASYNC_ON);
}
/**
* Called when a DVR entry is updated/added
*/
static void
_htsp_dvr_entry_update(dvr_entry_t *de, const char *msg)
{
htsp_connection_t *htsp;
LIST_FOREACH(htsp, &htsp_async_connections, htsp_async_link)
{
if (htsp_user_access_channel(htsp,de->de_channel))
htsp_send_message(htsp, htsp_build_dvrentry(de, msg), NULL);
}
}
/**
* Called from dvr_db.c when a DVR entry is created
@ -2374,7 +2400,7 @@ htsp_tag_delete(channel_tag_t *ct)
void
htsp_dvr_entry_add(dvr_entry_t *de)
{
htsp_async_send(htsp_build_dvrentry(de, "dvrEntryAdd"), HTSP_ASYNC_ON);
_htsp_dvr_entry_update(de, "dvrEntryAdd");
}
@ -2384,7 +2410,7 @@ htsp_dvr_entry_add(dvr_entry_t *de)
void
htsp_dvr_entry_update(dvr_entry_t *de)
{
htsp_async_send(htsp_build_dvrentry(de, "dvrEntryUpdate"), HTSP_ASYNC_ON);
_htsp_dvr_entry_update(de, "dvrEntryUpdate");
}
@ -2400,19 +2426,28 @@ htsp_dvr_entry_delete(dvr_entry_t *de)
htsp_async_send(m, HTSP_ASYNC_ON);
}
/**
* Called when a event entry is updated/added
*/
static void
_htsp_event_update(epg_broadcast_t *ebc, const char *msg)
{
htsp_connection_t *htsp;
htsmsg_t *m;
LIST_FOREACH(htsp, &htsp_async_connections, htsp_async_link) {
if (!(htsp->htsp_async_mode & HTSP_ASYNC_EPG) || !htsp_user_access_channel(htsp,ebc->channel)) continue;
m = htsp_build_event(ebc, msg, htsp->htsp_language, 0, htsp);
htsp_send_message(htsp, m, NULL);
}
}
/**
* Event added
*/
void
htsp_event_add(epg_broadcast_t *ebc)
{
htsp_connection_t *htsp;
htsmsg_t *m;
LIST_FOREACH(htsp, &htsp_async_connections, htsp_async_link) {
if (!(htsp->htsp_async_mode & HTSP_ASYNC_EPG)) continue;
m = htsp_build_event(ebc, "eventAdd", htsp->htsp_language, 0, htsp);
htsp_send_message(htsp, m, NULL);
}
_htsp_event_update(ebc, "eventAdd");
}
/**
@ -2421,13 +2456,7 @@ htsp_event_add(epg_broadcast_t *ebc)
void
htsp_event_update(epg_broadcast_t *ebc)
{
htsp_connection_t *htsp;
htsmsg_t *m;
LIST_FOREACH(htsp, &htsp_async_connections, htsp_async_link) {
if (!(htsp->htsp_async_mode & HTSP_ASYNC_EPG)) continue;
m = htsp_build_event(ebc, "eventUpdate", htsp->htsp_language, 0, htsp);
htsp_send_message(htsp, m, NULL);
}
_htsp_event_update(ebc, "eventUpdate");
}
/**
@ -2820,3 +2849,24 @@ htsp_streaming_input(void *opaque, streaming_message_t *sm)
}
streaming_msg_free(sm);
}
/**
*
*/
static int
htsp_user_access_channel(htsp_connection_t *htsp, channel_t *ch) {
if (!access_tag_only(htsp->htsp_username))
return 1;
else
{
if (!ch)
return 0;
channel_tag_mapping_t *ctm;
LIST_FOREACH(ctm, &ch->ch_ctms, ctm_channel_link)
{
if (!strcmp(htsp->htsp_username, ctm->ctm_tag->ct_name))
return 1;
}
}
return 0;
}

9
src/webui/static/app/acleditor.js
View file

@ -56,14 +56,19 @@ tvheadend.acleditor = function() {
dataIndex : 'admin',
width : 100
}, {
xtype: 'checkcolumn',
header : "Access Tag Only",
dataIndex : 'tag_only',
width : 200
}, {
header : "Comment",
dataIndex : 'comment',
width : 400,
width : 300,
editor : new fm.TextField({})
}]});
var UserRecord = Ext.data.Record.create(
[ 'enabled', 'streaming', 'dvr', 'dvrallcfg', 'admin', 'webui', 'username',
[ 'enabled', 'streaming', 'dvr', 'dvrallcfg', 'admin', 'webui', 'username', 'tag_only',
'prefix', 'password', 'comment'
]);