Skip to content

Use nonces for DAAP session IDs. #105

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

Open
thsnr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use nonces for DAAP session IDs. #105

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
17 changes: 12 additions & 5 deletions src/httpd_daap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
#include <tre/tre.h>
#include <avl.h>

#include <gcrypt.h>

#include "evbuffer/evbuffer.h"
#include "logger.h"
#include "db.h"
Expand Down Expand Up @@ -102,7 +104,6 @@ static char *default_meta_group = "dmap.itemname,dmap.persistentid,daap.songalbu
/* DAAP session tracking */
static dispatch_queue_t sessions_sq;
static avl_tree_t *daap_sessions;
static int next_session_id;

/* Update requests */
static int current_rev;
Expand Down Expand Up @@ -199,11 +200,18 @@ daap_session_register(void)

dispatch_sync(sessions_sq, ^{
avl_node_t *node;
struct daap_session existing;

s->id = next_session_id;

next_session_id++;
/* Find a random session id that is not in use. */
do
{
gcry_create_nonce((unsigned char *)&existing.id, sizeof(existing.id));
if (existing.id < 0)
existing.id += INT_MAX + 1; /* Convert negative two's complement to positive. */
}
while (avl_search(daap_sessions, &existing) != NULL);

s->id = existing.id;
node = avl_insert(daap_sessions, s);
if (!node)
{
Expand Down Expand Up @@ -2744,7 +2752,6 @@ daap_init(void)
int i;
int ret;

next_session_id = 100; /* gotta start somewhere, right? */
current_rev = 2;
update_requests = NULL;

Expand Down