ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-09 20:11:00 +00:00
Code Issues Projects Releases Wiki Activity

spend less cpu on http attacks, bidi tweak, stop smtp-out

Browse Source
This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2016-11-17 05:49:53 +01:00
parent c5ce025488
commit 3eab6d6140
7 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
world/net/http/server.c
View File

@ -113,12 +113,7 @@ process_header() {
} }
parse_request(input) { parse_request(input) {
P2(("=== HTTP got: %O from %O\n", input, query_ip_name(ME))) P0(("=== HTTP got: %O from %O\n", input, query_ip_name(ME)))
// reset state. in case we support HTTP/1.1. do we?
method = item = url = prot = qs = 0;
headers = ([]);
body = "";
if (!input || input=="") { if (!input || input=="") {
// should return error? // should return error?
@ -126,9 +121,14 @@ parse_request(input) {
// lets just ignore the empty line // lets just ignore the empty line
return 1; return 1;
} }
// reset state. in case we support HTTP/1.1. do we?
method = item = url = prot = qs = 0;
headers = ([]);
body = "";
input = explode(input, " "); input = explode(input, " ");
switch(sizeof(input)) { switch(sizeof(input)) {
default: case 3:
prot = input[2]; prot = input[2];
next_input_to(#'parse_header); next_input_to(#'parse_header);
case 2: case 2:
@ -140,12 +140,18 @@ parse_request(input) {
unless (sscanf(url, "%s?%s", item, qs)) item = url; unless (sscanf(url, "%s?%s", item, qs)) item = url;
method = lower_case(input[0]); method = lower_case(input[0]);
break; break;
case 1: default:
// should return error! http_error(prot, R_BADREQUEST,
quit(); "invalid "+HTTP_SVERS+" request");
quit(); return 1;
} }
P4(("=== HTTP user requested url: %O\n", url)) P4(("=== HTTP user requested url: %O\n", url))
if (method == "connect") next_input_to(#'parse_wait); if (method == "connect") next_input_to(#'parse_wait);
else if (!sizeof(url) || url[0] != '/') {
http_error(prot, R_BADREQUEST,
"invalid "+HTTP_SVERS+" request");
quit(); return 1;
}
else if (!prot) process(); // HTTP/0.9 has no headers else if (!prot) process(); // HTTP/0.9 has no headers
else next_input_to(#'parse_header); else next_input_to(#'parse_header);
} }

2
world/net/include/net.h
View File

@ -224,7 +224,7 @@
# define PERSISTENT_MASTERS # define PERSISTENT_MASTERS
# define NEW_RENDER # define NEW_RENDER
# define MUCSUC # define MUCSUC
# define XMPP_BIDI //# define XMPP_BIDI
#endif #endif
#define GAMMA // code that has left BETA and is in production use #define GAMMA // code that has left BETA and is in production use

2
world/net/jabber/common.c
View File

@ -51,7 +51,7 @@ int emit(string message) {
string t, err; string t, err;
// according to http://www.w3.org/TR/xml/#charsets // according to http://www.w3.org/TR/xml/#charsets
// remove illegal unicode chars --// thx elmex // remove illegal unicode chars --// thx elmex
err = catch(t = regreplace(message, "[^\\x{9}\\x{A}\\x{D}\\x{20}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{10000}-\\x{10FFFFFF}]+", "*", RE_GLOBAL | RE_UTF8); nolog); err = catch(t = regreplace(message, "[^\\x{9}\\x{A}\\x{D}\\x{20}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{10000}-\\x{10FFFFF}]+", "*", RE_GLOBAL | RE_UTF8); nolog);
if (err || t != message) { if (err || t != message) {
// Info: Chars filtered to %O. Message was %O. // Info: Chars filtered to %O. Message was %O.
log_file("CHARS_XMPP", "[%s] %O %O %O\n", ctime(), log_file("CHARS_XMPP", "[%s] %O %O %O\n", ctime(),

6
world/net/jabber/gateway.c
View File

@ -145,7 +145,8 @@ verify_connection(string to, string from, string type) {
sAuthenticated(from); sAuthenticated(from);
#ifdef XMPP_BIDI #ifdef XMPP_BIDI
if (bidi) { if (bidi) {
P0(("doing register target for xmpp bidi!!!!\n")) P0(("doing register target for xmpp bidi (2)!!!!\n"))
P0(("register_target(XMPP + %O)\n", from))
register_target(XMPP + from); register_target(XMPP + from);
} }
#endif #endif
@ -423,7 +424,8 @@ jabberMsg(XMLNode node) {
while (remove_call_out(#'quit) != -1); while (remove_call_out(#'quit) != -1);
#ifdef XMPP_BIDI #ifdef XMPP_BIDI
if (bidi) { if (bidi) {
P0(("doing register target for xmpp bidi!!!!\n")) P0(("doing register target for xmpp bidi (1)!!!!\n"))
P0(("register_target(XMPP + %O)\n", t))
register_target(XMPP + t); register_target(XMPP + t);
} }
#endif #endif

5
world/net/smtp/outgoing.c
View File

@ -1,5 +1,10 @@
// outgoing mail queue for psyced. // outgoing mail queue for psyced.
// this has not only been leaking message contents..
// it is currently spamming previous room visitors (see /route) FIXME!!
// so we disable it completely for now
#define OFFLINE
// i *could* rewrite this to use net/spool.c // i *could* rewrite this to use net/spool.c
// but then i'd have such a mess in my room // but then i'd have such a mess in my room

2
world/net/tn/server.c
View File

@ -10,7 +10,7 @@ qScheme() { return "tn"; }
human(x) { human(x) {
x = lower_case(x); x = lower_case(x);
unless (abbrev(x, "yes") || abbrev(x, "ja") || abbrev(x, "si") || abbrev(x, "zes")) { if (!strlen(x) || !(abbrev(x, "yes") || abbrev(x, "ja") || abbrev(x, "si") || abbrev(x, "zes"))) {
emit("\nSorry, no other species welcome currently.\n\n"); emit("\nSorry, no other species welcome currently.\n\n");
} }
// now check limits // now check limits

4
world/net/usercmd.i
View File

@ -2035,7 +2035,9 @@ tell(pal, what, palo, how, mc, tv) {
#ifdef MUDLINK #ifdef MUDLINK
if (pal == "$mud") { if (pal == "$mud") {
unless (objectp(mudlink) && interactive(mudlink)) mudlink(v("mudlink")); unless (objectp(mudlink) && interactive(mudlink)) mudlink(v("mudlink"));
if (objectp(mudlink)) mudlink -> send(what +"\n"); // we could call 'enqueue' if not interactive yet, but that would
// probably be even worse for UX. let's just drop that trigger message.
if (objectp(mudlink) && interactive(mudlink)) mudlink -> send(what +"\n");
return; return;
} }
#endif // MUDLINK #endif // MUDLINK