Skip to content
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

log format changed #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

log format changed #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
521d4fd
set log format to xml
chenyue229266 Jan 2, 2014
783b699
add strcmb func
chenyue229266 Jan 2, 2014
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
105 changes: 53 additions & 52 deletions events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,59 +58,60 @@ typedef enum EVENT
JavaScript_Execute
}EVENT;

static const char *ArrayEvent[] =
//[][0] is class, [][1] is function name
static const char *ArrayEvent[][2] =
{
"Default event",
"HTMLDocument::createElement",
"HTMLElement::create",
"HTMLElement::setInnerHTML",
"HTMLElement::setOuterHTML",
"HTMLElement::setInnerText",
"HTMLElement::setOuterText",
"DOMWindow::alert",
"DOMWindow::confirm",
"DOMWindow::prompt",
"WebCore::setCookies",
"JSDocument::setLocation",
"JSLocation::setHref",
"JSLocation::setProtocol",
"JSLocation::setHost",
"JSLocation::setHostname",
"JSLocation::setPort",
"JSLocation::setPathname",
"JSLocation::setSearch",
"JSLocation::setHash",
"JSLocation::replace",
"JSLocation::reload",
"JSLocation::assign",
"JSEventListener::handleEvent",
"Element::getAttribute",
"Element::setAttribute",
"Element::focus",
"Element::blur",
"Document::getElementById",
"Document::createElement",
"Document::createDocumentFragment",
"Document::createTextNode",
"Document::setDocumentURI",
"Document::setTitle",
"Document::open",
"Document::close",
"Document::write",
"Document::cookie",
"Document::setCookie",
"Document::setDomain",
"Document::execCommand",
"Document::createAttribute",
"Document::setWindowAttributeEventListener",
"Node::addEventListener",
"Node::appendChild",
"Node::insertBefore",
"Storage::getItem",
"Storage::setItem",
"Storage::removeItem",
"Storage::clear",
"JavaScript_Execute"
"", "Default event",
"HTMLDocument", "createElement",
"HTMLElement", "create",
"HTMLElement", "setInnerHTML",
"HTMLElement", "setOuterHTML",
"HTMLElement", "setInnerText",
"HTMLElement", "setOuterText",
"DOMWindow", "alert",
"DOMWindow", "confirm",
"DOMWindow", "prompt",
"WebCore", "setCookies",
"JSDocument", "setLocation",
"JSLocation", "setHref",
"JSLocation", "setProtocol",
"JSLocation", "setHost",
"JSLocation", "setHostname",
"JSLocation", "setPort",
"JSLocation", "setPathname",
"JSLocation", "setSearch",
"JSLocation", "setHash",
"JSLocation", "replace",
"JSLocation", "reload",
"JSLocation", "assign",
"JSEventListener", "handleEvent",
"Element", "getAttribute",
"Element", "setAttribute",
"Element", "focus",
"Element", "blur",
"Document", "getElementById",
"Document", "createElement",
"Document", "createDocumentFragment",
"Document", "createTextNode",
"Document", "setDocumentURI",
"Document", "setTitle",
"Document", "open",
"Document", "close",
"Document", "write",
"Document", "cookie",
"Document", "setCookie",
"Document", "setDomain",
"Document", "execCommand",
"Document", "createAttribute",
"Document", "setWindowAttributeEventListener",
"Node", "addEventListener",
"Node", "appendChild",
"Node", "insertBefore",
"Storage", "getItem",
"Storage", "setItem",
"Storage", "removeItem",
"Storage", "clear",
"", "JavaScript_Execute"
};

#endif
156 changes: 126 additions & 30 deletions module_logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
#include <time.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <stdarg.h> /*variadic function*/

// Consts
#define HL_LOG_PATTERN "%s [%s] %s | %s"
#define HL_LOG_TAG "LIB_HOOK"
#define HL_LOG_INDENT 4
#define HL_LOG_EXTRA_LEN 10

// Set the configuration(for Android only)
#ifdef __arm__
Expand All @@ -23,31 +22,83 @@ __attribute__((visibility ("default"))) int set_Security_ConfValue(const char *l
#endif

// Example: my_event_logger function
__attribute__((visibility ("hidden"))) const char* eventToString(EVENT event)
{
return ArrayEvent[event];
}

__attribute__((visibility ("hidden"))) char* stringWithSpace(int count)
{
char *ans = (char *)malloc(count + 1);
memset(ans, ' ', count);
ans[count] = '\0';
return ans;
}

__attribute__((visibility ("hidden"))) char* nameWithTime()
__attribute__((visibility ("hidden"))) char *nameWithTime()
{
time_t logtime;
struct tm *ptime;
char * logname = (char *)malloc(25);

logtime = time(NULL);
ptime = localtime(&logtime);
sprintf(logname,"log-%04d%02d%02d%02d%02d.txt",1900+ptime->tm_year,1+ptime->tm_mon,ptime->tm_mday,ptime->tm_hour,ptime->tm_min);
sprintf(logname, "log-%04d%02d%02d%02d%02d.txt", 1900+ptime->tm_year, 1+ptime->tm_mon, ptime->tm_mday, ptime->tm_hour, ptime->tm_min);
return logname;
}

//combine strings into one string, first argument is the num of strings, need to free the returned string outside
__attribute__((visibility ("hidden"))) char *strcmb(unsigned int num, ...)
{
va_list arg_ptr;
va_start(arg_ptr, num);
unsigned int len = 0;
unsigned int i;
for (i = 1; i <= num; i++)
len += strlen(va_arg(arg_ptr, char *));
va_start(arg_ptr, num);
char *str = (char *)malloc(len + 1);
str[0] = 0;
for (i = 1; i <= num; i++)
strcat(str, va_arg(arg_ptr, char *));
va_end(arg_ptr);
return str;
}

__attribute__((visibility ("hidden"))) char *setfinalStr(int hlStackDepth, EVENT event, const char *state, const char *arg_strs)
{
//prepare strings: level, fclass, name, type, value
char level[2] = "";
level[0] = (char)(hlStackDepth%10 + 48); /*cycle from 0 to 9, and lStackDepth is always positive, right?*/
const char *fclass = ArrayEvent[event][0];
const char *name = ArrayEvent[event][1];
char type[7] = "";
if (strcmp(state, "=>") == 0)
strcpy(type, "call");
else if (strcmp(state, "<=") == 0)
strcpy(type, "return");
else if (strcmp(state, "--") == 0)
strcpy(type, "repeat");
else
strcpy(type, "other");
const char *value = arg_strs;

//combined strings into rows
char indentSpace[HL_LOG_INDENT + 1] = "";
memset(indentSpace, ' ', HL_LOG_INDENT);
char *row1 = strcmb(3, "<log level=\"", level, "\">\n");
char *row2;
if (event != JavaScript_Execute)
row2 = strcmb(8, indentSpace, "<func class=\"", fclass, "\" name=\"", name, "\" type=\"", type, "\">\n");
else
row2 = strcmb(6, indentSpace, "<code name=\"", name, "\" type=\"", type, "\">\n");
char *row3 = strcmb(4, indentSpace, indentSpace, value, "\n");
char *row4;
if (event != JavaScript_Execute)
row4 = strcmb(2, indentSpace, "</func>\n");
else
row4 = strcmb(2, indentSpace, "</code>\n");
char row5[8] = "</log>\n";

//set finalStr
char *finalStr = strcmb(5, row1, row2, row3, row4, row5);

//free memory
free(row1);
free(row2);
free(row3);
free(row4);

return finalStr;
}

__attribute__((visibility ("hidden"))) void my_event_logger(EVENT event, const char *state, void **func_pointers, const char *arg_strs, void **raw_args)
{
static int Exec_flag = 0; /* 0 Not Executed 1 Be Executed */
Expand All @@ -57,11 +108,8 @@ __attribute__((visibility ("hidden"))) void my_event_logger(EVENT event, const c
if(strcmp(state, "<=") == 0)
hlStackDepth --;

const char *eventStr = eventToString(event);
char *indentSpace = stringWithSpace(HL_LOG_INDENT * hlStackDepth);
char *finalStr = (char *)malloc(strlen(eventStr) + strlen(state) + strlen(arg_strs) + HL_LOG_EXTRA_LEN + HL_LOG_INDENT * hlStackDepth);
sprintf(finalStr,HL_LOG_PATTERN,indentSpace,state,eventStr,arg_strs);

char *finalStr = setfinalStr(hlStackDepth, event, state, arg_strs);

#ifdef __arm__
static int logtype = 0; /* 0:invoking __android_log_write others:write the log to specific files*/
if(Exec_flag == 0)
Expand All @@ -83,13 +131,13 @@ __attribute__((visibility ("hidden"))) void my_event_logger(EVENT event, const c
char log_folder[50], logfile_name[50];
sprintf(log_folder, "%s/webkit_logs", log_location);
mkdir(log_folder, 0775);
sprintf(logfile_name,"%s/%s", log_folder, logname);
sprintf(logfile_name, "%s/%s", log_folder, logname);
logfile_pointer = fopen(logfile_name, "a+");
free(logname);
Exec_flag = 1;
}
if(logfile_pointer)
fprintf(logfile_pointer,"%s\t%s\n",HL_LOG_TAG,finalStr);
fprintf(logfile_pointer, "%s\t%s\n", HL_LOG_TAG, finalStr);
}
#else
if(Exec_flag == 0)
Expand All @@ -101,20 +149,19 @@ __attribute__((visibility ("hidden"))) void my_event_logger(EVENT event, const c
else
{
char logfile_name[50];
mkdir("webkit_logs",0775);
mkdir("webkit_logs", 0775);
char *logname = nameWithTime();
sprintf(logfile_name,"%s/%s","webkit_logs",logname);
logfile_pointer = fopen(logfile_name,"a+");
sprintf(logfile_name, "%s/%s", "webkit_logs", logname);
logfile_pointer = fopen(logfile_name, "a+");
free(logname);
}
Exec_flag = 1;
}
if(logfile_pointer)
fprintf(logfile_pointer,"%s\t%s\n",HL_LOG_TAG,finalStr);
fprintf(logfile_pointer, "%s\t%s\n", HL_LOG_TAG, finalStr);
#endif

free(finalStr);
free(indentSpace);

if(strcmp(state, "=>") == 0)
hlStackDepth ++;
Expand All @@ -125,6 +172,55 @@ __attribute__((visibility ("default"))) int security_module_init(void **event_ha
{
event_handler[EVENT_DEFAULT] = (void *)(&my_event_logger);
event_handler[HTMLDocument_createElement] = (void *)(&my_event_logger);
event_handler[JavaScript_Execute]= (void *)(&my_event_logger);
event_handler[HTMLElement_create] = (void *)(&my_event_logger);
event_handler[HTMLElement_setInnerHTML] = (void *)(&my_event_logger);
event_handler[HTMLElement_setOuterHTML] = (void *)(&my_event_logger);
event_handler[HTMLElement_setInnerText] = (void *)(&my_event_logger);
event_handler[HTMLElement_setOuterText] = (void *)(&my_event_logger);
event_handler[DOMWindow_alert] = (void *)(&my_event_logger);
event_handler[DOMWindow_confirm] = (void *)(&my_event_logger);
event_handler[DOMWindow_prompt] = (void *)(&my_event_logger);
event_handler[WebCore_setCookies] = (void *)(&my_event_logger);
event_handler[JSDocument_setLocation] = (void *)(&my_event_logger);
event_handler[JSLocation_setHref] = (void *)(&my_event_logger);
event_handler[JSLocation_setProtocol] = (void *)(&my_event_logger);
event_handler[JSLocation_setHost] = (void *)(&my_event_logger);
event_handler[JSLocation_setHostname] = (void *)(&my_event_logger);
event_handler[JSLocation_setPort] = (void *)(&my_event_logger);
event_handler[JSLocation_setPathname] = (void *)(&my_event_logger);
event_handler[JSLocation_setSearch] = (void *)(&my_event_logger);
event_handler[JSLocation_setHash] = (void *)(&my_event_logger);
event_handler[JSLocation_replace] = (void *)(&my_event_logger);
event_handler[JSLocation_reload] = (void *)(&my_event_logger);
event_handler[JSLocation_assign] = (void *)(&my_event_logger);
event_handler[JSEventListener_handleEvent] = (void *)(&my_event_logger);
event_handler[Element_getAttribute] = (void *)(&my_event_logger);
event_handler[Element_setAttribute] = (void *)(&my_event_logger);
event_handler[Element_focus] = (void *)(&my_event_logger);
event_handler[Element_blur] = (void *)(&my_event_logger);
event_handler[Document_getElementById] = (void *)(&my_event_logger);
event_handler[Document_createElement] = (void *)(&my_event_logger);
event_handler[Document_createDocumentFragment] = (void *)(&my_event_logger);
event_handler[Document_createTextNode] = (void *)(&my_event_logger);
event_handler[Document_setDocumentURI] = (void *)(&my_event_logger);
event_handler[Document_setTitle] = (void *)(&my_event_logger);
event_handler[Document_open] = (void *)(&my_event_logger);
event_handler[Document_close] = (void *)(&my_event_logger);
event_handler[Document_write] = (void *)(&my_event_logger);
event_handler[Document_cookie] = (void *)(&my_event_logger);
event_handler[Document_setCookie] = (void *)(&my_event_logger);
event_handler[Document_setDomain] = (void *)(&my_event_logger);
event_handler[Document_execCommand] = (void *)(&my_event_logger);
event_handler[Document_createAttribute] = (void *)(&my_event_logger);
event_handler[Document_setWindowAttributeEventListener] = (void *)(&my_event_logger);
event_handler[Node_addEventListener] = (void *)(&my_event_logger);
event_handler[Node_appendChild] = (void *)(&my_event_logger);
event_handler[Node_insertBefore] = (void *)(&my_event_logger);
event_handler[Storage_getItem] = (void *)(&my_event_logger);
event_handler[Storage_setItem] = (void *)(&my_event_logger);
event_handler[Storage_removeItem] = (void *)(&my_event_logger);
event_handler[Storage_clear] = (void *)(&my_event_logger);
event_handler[JavaScript_Execute] = (void *)(&my_event_logger);

return 0;
}