gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-04 12:17:35 +03:00
Code Issues Projects Releases Wiki Activity

fix addurl functionality on root page.

Browse Source
This commit is contained in:
mwells 2014-07-04 10:43:04 -07:00
parent 79f19d3aa3
commit f9ae433ac1
3 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PageInject.cpp
View File

@ -275,6 +275,12 @@ bool Msg7::inject ( void *state ,
return true;
}
if ( ! gr->m_url ) {
log("inject: no url provied to inject");
g_errno = EBADURL;
return true;
}
//char *coll = cr->m_coll;
m_state = state;

77
PageRoot.cpp
View File

@ -963,7 +963,7 @@ bool printAddUrlHomePage ( SafeBuf &sb , char *url , HttpRequest *r ) {
"onLoad=\""
"var client = new XMLHttpRequest();\n"
"client.onreadystatechange = handler;\n"
"var url='/addurl?u="
"var url='/addurl?urls="
);
sb.urlEncode ( url );
// propagate "admin" if set
@ -1042,7 +1042,7 @@ bool printAddUrlHomePage ( SafeBuf &sb , char *url , HttpRequest *r ) {
if ( ! coll )
coll = "";
sb.safePrintf("<input name=u type=text size=60 value=\"");
sb.safePrintf("<input name=urls type=text size=60 value=\"");
if ( url ) {
SafeBuf tmp;
tmp.safePrintf("%s",url);
@ -1092,7 +1092,7 @@ bool printAddUrlHomePage ( SafeBuf &sb , char *url , HttpRequest *r ) {
//"alert('shit');"
"var client = new XMLHttpRequest();\n"
"client.onreadystatechange = handler;\n"
"var url='/addurl?u="
"var url='/addurl?urls="
, root );
sb.urlEncode ( url );
// propagate "admin" if set
@ -1619,26 +1619,26 @@ static bool s_inprogress = false;
// . returns false if blocked, true otherwise
// . sets g_errno on error
bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
bool sendPageAddUrl ( TcpSocket *sock , HttpRequest *hr ) {
// . get fields from cgi field of the requested url
// . get the search query
long urlLen = 0;
char *url = r->getString ( "u" , &urlLen , NULL /*default*/);
char *url = hr->getString ( "urls" , &urlLen , NULL /*default*/);
// see if they provided a url of a file of urls if they did not
// provide a url to add directly
bool isAdmin = g_conf.isCollAdmin ( s , r );
bool isAdmin = g_conf.isCollAdmin ( sock , hr );
long ufuLen = 0;
char *ufu = NULL;
if ( isAdmin )
// get the url of a file of urls (ufu)
ufu = r->getString ( "ufu" , &ufuLen , NULL );
//if ( isAdmin )
// // get the url of a file of urls (ufu)
// ufu = hr->getString ( "ufu" , &ufuLen , NULL );
// can't be too long, that's obnoxious
if ( urlLen > MAX_URL_LEN || ufuLen > MAX_URL_LEN ) {
g_errno = EBUFTOOSMALL;
g_msg = " (error: url too long)";
return g_httpServer.sendErrorReply(s,500,"url too long");
return g_httpServer.sendErrorReply(sock,500,"url too long");
}
// get the collection
//long collLen = 0;
@ -1650,20 +1650,20 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
//}
// get collection rec
CollectionRec *cr = g_collectiondb.getRec ( r );
CollectionRec *cr = g_collectiondb.getRec ( hr );
// bitch if no collection rec found
if ( ! cr ) {
g_errno = ENOCOLLREC;
g_msg = " (error: no collection)";
return g_httpServer.sendErrorReply(s,500,"no coll rec");
return g_httpServer.sendErrorReply(sock,500,"no coll rec");
}
// . make sure the ip is not banned
// . we may also have an exclusive list of IPs for private collections
if ( ! cr->hasSearchPermission ( s ) ) {
if ( ! cr->hasSearchPermission ( sock ) ) {
g_errno = ENOPERM;
g_msg = " (error: permission denied)";
return g_httpServer.sendErrorReply(s,500,mstrerror(g_errno));
return g_httpServer.sendErrorReply(sock,500,mstrerror(g_errno));
}
@ -1672,8 +1672,8 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
//
if ( ! url ) {
SafeBuf sb;
printAddUrlHomePage ( sb , NULL , r );
return g_httpServer.sendDynamicPage(s,
printAddUrlHomePage ( sb , NULL , hr );
return g_httpServer.sendDynamicPage(sock,
sb.getBufStart(),
sb.length(),
// 120 secs cachetime
@ -1686,19 +1686,19 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
200,
NULL, // cookie
"UTF-8",
r);
hr);
}
//
// run the ajax script on load to submit the url now
//
long id = r->getLong("id",0);
long id = hr->getLong("id",0);
// if we are not being called by the ajax loader, the put the
// ajax loader script into the html now
if ( id == 0 ) {
SafeBuf sb;
printAddUrlHomePage ( sb , url , r );
return g_httpServer.sendDynamicPage ( s,
printAddUrlHomePage ( sb , url , hr );
return g_httpServer.sendDynamicPage ( sock,
sb.getBufStart(),
sb.length(),
// don't cache any more
@ -1711,7 +1711,7 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
200,
NULL, // cookie
"UTF-8",
r);
hr);
}
//
@ -1742,7 +1742,7 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
if ( msg ) {
SafeBuf sb;
sb.safePrintf("%s",msg);
g_httpServer.sendDynamicPage (s,
g_httpServer.sendDynamicPage (sock,
sb.getBufStart(),
sb.length(),
3600,//-1, // cachetime
@ -1764,10 +1764,10 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
g_errno = ENOMEM;
log("PageAddUrl: new(%i): %s",
sizeof(State1i),mstrerror(g_errno));
return g_httpServer.sendErrorReply(s,500,mstrerror(g_errno)); }
return g_httpServer.sendErrorReply(sock,500,mstrerror(g_errno)); }
mnew ( st1 , sizeof(State1i) , "PageAddUrl" );
// save socket and isAdmin
st1->m_socket = s;
st1->m_socket = sock;
st1->m_isAdmin = isAdmin;
/*
@ -1809,12 +1809,12 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
//unsigned long h = ipdom ( s->m_ip );
// . use top 2 bytes now, some isps have large blocks
// . if this causes problems, then they can do pay for inclusion
unsigned long h = iptop ( s->m_ip );
unsigned long h = iptop ( sock->m_ip );
long codeLen;
char* code = r->getString("code", &codeLen);
if(g_autoBan.hasCode(code, codeLen, s->m_ip)) {
char* code = hr->getString("code", &codeLen);
if(g_autoBan.hasCode(code, codeLen, sock->m_ip)) {
long uipLen = 0;
char* uip = r->getString("uip",&uipLen);
char* uip = hr->getString("uip",&uipLen);
long hip = 0;
//use the uip when we have a raw query to test if
//we can submit
@ -1824,18 +1824,18 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
}
}
st1->m_strip = r->getLong("strip",0);
st1->m_strip = hr->getLong("strip",0);
// . Remember, for cgi, if the box is not checked, then it is not
// reported in the request, so set default return value to 0
// . support both camel case and all lower-cases
st1->m_spiderLinks = r->getLong("spiderLinks",0);
st1->m_spiderLinks = r->getLong("spiderlinks",st1->m_spiderLinks);
st1->m_spiderLinks = hr->getLong("spiderLinks",0);
st1->m_spiderLinks = hr->getLong("spiderlinks",st1->m_spiderLinks);
// . should we force it into spiderdb even if already in there
// . use to manually update spider times for a url
// . however, will not remove old scheduled spider times
// . mdw: made force on the default
st1->m_forceRespider = r->getLong("force",1); // 0);
st1->m_forceRespider = hr->getLong("force",1); // 0);
long now = getTimeGlobal();
// . allow 1 submit every 1 hour
@ -1850,7 +1850,7 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
delete (st1);
// use cachetime of 3600 so it does not re-inject if you hit
// the back button!
g_httpServer.sendDynamicPage (s,
g_httpServer.sendDynamicPage (sock,
sb.getBufStart(),
sb.length(),
3600,//-1, // cachetime
@ -1878,6 +1878,17 @@ bool sendPageAddUrl ( TcpSocket *s , HttpRequest *r ) {
*/
// set this. also sets gr->m_hr
GigablastRequest *gr = &st1->m_msg7.m_gr;
// this will fill in GigablastRequest so all the parms we need are set
g_parms.setGigablastRequest ( sock , hr , gr );
// this is really an injection, not add url, so make
// GigablastRequest::m_url point to Gigablast::m_urlsBuf because
// the PAGE_ADDURLS2 parms in Parms.cpp fill in the m_urlsBuf.
// HACK!
gr->m_url = gr->m_urlsBuf;
//
// inject using msg7
//

6
Parms.cpp
View File

@ -1033,6 +1033,12 @@ bool Parms::setGigablastRequest ( TcpSocket *socket ,
//
setToDefault ( THIS , obj , NULL);
// map PAGE_ADDURL to PAGE_ADDURL2 so
// /addurl is same as /admin/addurl as far as parms.
if ( page == PAGE_ADDURL )
page = PAGE_ADDURL2;
// loop through cgi parms
for ( long i = 0 ; i < hr->getNumFields() ; i++ ) {
// get cgi parm name