Skip to content

Commit

Permalink
Add "/history"
Browse files Browse the repository at this point in the history
  • Loading branch information
@DL6ER
DL6ER committed Jun 14, 2017
1 parent f2f9601 commit 48d355b
Showing 1 changed file with 128 additions and 44 deletions.
172 changes: 128 additions & 44 deletions request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,14 @@ void process_api_request(char *client_message, int *sock, bool header)
{
getQueryTypes(sock, type);
}
else if(command(client_message, "GET /history"))
{
getAllQueries(client_message, sock, type);
}
else if(header)
{
ssend(*sock,
"HTTP/1.0 404 Not Found\nServer: FTL\nCache-Control: no-cache\n"
"HTTP/1.0 404 Not Found\nServer: FTL\nCache-Control: no-cache\nAccess-Control-Allow-Origin: *\n"
"Content-Type: application/json\nContent-Length: 21\n\n{status: \"not_found\"}");
}
}
Expand All @@ -200,7 +204,7 @@ void sendAPIResponse(int sock, char type) {
{
// Send header only for full HTTP requests
ssend(sock,
"HTTP/1.0 200 OK\nServer: FTL\nCache-Control: no-cache\n"
"HTTP/1.0 200 OK\nServer: FTL\nCache-Control: no-cache\nAccess-Control-Allow-Origin: *\n"
"Content-Type: application/json\n\n");
}
}
Expand Down Expand Up @@ -772,53 +776,102 @@ void getAllQueries(char *client_message, int *sock, char type)
// Do we want a more specific version of this command (domain/client/time interval filtered)?
int from = 0, until = 0;
bool filtertime = false;
if(command(client_message, ">getallqueries-time"))

char *domainname = NULL;
bool filterdomainname = false;

char *clientname = NULL;
bool filterclientname = false;

if(type == SOCKET)
{
// Get from to until boundaries
sscanf(client_message, ">getallqueries-time %i %i",&from, &until);
if(debugclients)
// Time filtering?
if(command(client_message, ">getallqueries-time"))
{
logg("Showing only limited time interval starting at ",from);
logg("Showing only limited time interval ending at ",until);
sscanf(client_message, ">getallqueries-time %i %i",&from, &until);
filtertime = true;
}
// Domain filtering?
if(command(client_message, ">getallqueries-domain"))
{
sscanf(client_message, ">getallqueries-domain %ms", &domainname);
filterdomainname = true;
}
// Client filtering?
if(command(client_message, ">getallqueries-client"))
{
sscanf(client_message, ">getallqueries-client %ms", &clientname);
filterclientname = true;
}
filtertime = true;
}

char *domainname;
bool filterdomainname = false;
if(command(client_message, ">getallqueries-domain"))
else
{
domainname = calloc(128, sizeof(char));
// Get domain name we want to see only (limit length to 127 chars)
sscanf(client_message, ">getallqueries-domain %127s", domainname);
if(debugclients)
logg("Showing only queries with domain %s", domainname);
filterdomainname = true;
}
// Time filtering?
const char * temp = strstr(client_message, "from=");
if(temp != NULL)
{
int num;
if(sscanf(temp, "from=%i", &num) > 0)
{
// User wants a different number of requests
from = num;
}
}
temp = strstr(client_message, "until=");
if(temp != NULL)
{
int num;
if(sscanf(temp, "until=%i", &num) > 0)
{
// User wants a different number of requests
until = num;
}
}

char *clientname;
bool filterclientname = false;
if(command(client_message, ">getallqueries-client"))
{
clientname = calloc(128, sizeof(char));
// Get client name we want to see only (limit length to 127 chars)
sscanf(client_message, ">getallqueries-client %127s", clientname);
if(debugclients)
logg("Showing only queries with client %s", clientname);
filterclientname = true;
// Domain filtering?
temp = strstr(client_message, "domain=");
if(temp != NULL)
{
sscanf(temp, "domain=%ms", &domainname);
filterdomainname = true;
}
temp = strstr(client_message, "client=");

// Client filtering?
if(temp != NULL)
{
sscanf(temp, "client=%ms", &clientname);
filterclientname = true;
}
}

int ibeg = 0, num;
// Test for integer that specifies number of entries to be shown
if(sscanf(client_message, ">%*[^(](%i)", &num) > 0)
if(type == SOCKET)
{
// User wants a different number of requests
// Don't allow a start index that is smaller than zero
ibeg = counters.queries-num;
if(ibeg < 0)
ibeg = 0;
if(debugclients)
logg("Showing only limited amount of queries: ",num);
if(sscanf(client_message, "%*[^(](%i)", &num) > 0)
{
// User wants a different number of requests
// Don't allow a start index that is smaller than zero
ibeg = counters.queries-num;
if(ibeg < 0)
ibeg = 0;
}
}
else
{
const char * limit = strstr(client_message, "limit=");
if(limit != NULL)
{
if(sscanf(limit, "limit=%i", &num) > 0)
{
// User wants a different number of requests
// Don't allow a start index that is smaller than zero
ibeg = counters.queries-num;
if(ibeg < 0)
ibeg = 0;
}
}
}

// Get potentially existing filtering flags
Expand Down Expand Up @@ -866,7 +919,13 @@ void getAllQueries(char *client_message, int *sock, char type)
logg("Privacy mode enabled");
}

int i;
if(type != SOCKET)
{
sendAPIResponse(*sock, type);
ssend(*sock, "{\"history\":[");
}

int i; bool first = true;
for(i=ibeg; i < counters.queries; i++)
{
validate_access("queries", i, true, __LINE__, __FUNCTION__, __FILE__);
Expand Down Expand Up @@ -913,22 +972,47 @@ void getAllQueries(char *client_message, int *sock, char type)
continue;
}

if(!privacymode)
if(type == SOCKET)
{
if(strlen(clients[queries[i].clientID].name) > 0)
ssend(*sock,"%i %s %s %s %i\n",queries[i].timestamp,type,domains[queries[i].domainID].domain,clients[queries[i].clientID].name,queries[i].status);
if(!privacymode)
{
if(strlen(clients[queries[i].clientID].name) > 0)
ssend(*sock,"%i %s %s %s %i\n",queries[i].timestamp,type,domains[queries[i].domainID].domain,clients[queries[i].clientID].name,queries[i].status);
else
ssend(*sock,"%i %s %s %s %i\n",queries[i].timestamp,type,domains[queries[i].domainID].domain,clients[queries[i].clientID].ip,queries[i].status);
}
else
ssend(*sock,"%i %s %s %s %i\n",queries[i].timestamp,type,domains[queries[i].domainID].domain,clients[queries[i].clientID].ip,queries[i].status);
{
ssend(*sock,"%i %s %s hidden %i\n",queries[i].timestamp,type,domains[queries[i].domainID].domain,queries[i].status);
}
}
else
{
ssend(*sock,"%i %s %s hidden %i\n",queries[i].timestamp,type,domains[queries[i].domainID].domain,queries[i].status);
// {"data":[["1497351662","IPv4","clients4.google.com","10.8.0.2","2"],
if(!first) ssend(*sock, ",");
first = false;

if(!privacymode)
{
if(strlen(clients[queries[i].clientID].name) > 0)
ssend(*sock,"[%i,\"%s\",\"%s\",\"%s\",%i]",queries[i].timestamp,type,domains[queries[i].domainID].domain,clients[queries[i].clientID].name,queries[i].status);
else
ssend(*sock,"[%i,\"%s\",\"%s\",\"%s\",%i]",queries[i].timestamp,type,domains[queries[i].domainID].domain,clients[queries[i].clientID].ip,queries[i].status);
}
else
{
ssend(*sock,"[%i,\"%s\",\"%s\",\"hidden\",%i]",queries[i].timestamp,type,domains[queries[i].domainID].domain,queries[i].status);
}
}
}

if(type != SOCKET)
ssend(*sock, "]}");

// Free allocated memory
if(filterclientname)
free(clientname);

if(filterdomainname)
free(domainname);

Expand Down

0 comments on commit 48d355b

Please sign in to comment.