psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

enabled TLS autodetect on HTTP port

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2011-08-23 19:47:54 +02:00
parent aaa3e94623
commit 35810767f6
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
world/drivers/ldmud/master/accept.c
View file

@ -46,16 +46,22 @@ void notify_shutdown_first(int progress) {
* input_to() can't be called from here. * input_to() can't be called from here.
* *
* uid is only passed if USE_AUTHLOCAL is built into the driver. * uid is only passed if USE_AUTHLOCAL is built into the driver.
*
* strange how int port and string service came into existence here
* since the driver isn't passing such arguments and there is no
* reason to call this from anywhere else. i presume they are a
* mistake!
*/ */
object connect(int uid, int port, string service) { object connect(int uid, int port, string service) {
int peerport; int peerport;
mixed arg, t; mixed arg, t;
unless (port) port = query_mud_port();
// now that's a bit of preprocessor magic you don't need to understand.. ;) // now that's a bit of preprocessor magic you don't need to understand.. ;)
D2( if (uid) D("master:connected on port "+ query_mud_port() +" by uid " D2( if (uid) D("master:connected on port "+ port +" by uid "
+ uid +"\n"); + uid +"("+ service + ")\n");
else) { else) {
D3(D("master:connected on port "+query_mud_port() D3(D("master:connected on port "+port
+" by "+query_ip_name()+"\n");) +" by "+query_ip_name()+"\n");)
} }
#ifndef H_DEFAULT_PROMPT #ifndef H_DEFAULT_PROMPT
@ -71,7 +77,7 @@ object connect(int uid, int port, string service) {
// we dont want the telnet machine most of the time // we dont want the telnet machine most of the time
// but disabling and re-enabling it for telnet doesn't work // but disabling and re-enabling it for telnet doesn't work
switch(port || query_mud_port()) { switch(port) {
#if HAS_PORT(PSYC_PORT, PSYC_PATH) && AUTODETECT #if HAS_PORT(PSYC_PORT, PSYC_PATH) && AUTODETECT
case PSYC_PORT: case PSYC_PORT:
#endif #endif
@ -84,7 +90,7 @@ object connect(int uid, int port, string service) {
# endif # endif
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) { if (t < 0 && t != ERR_TLS_NOT_DETECTED) {
PP(( "TLS on %O: %O\n", query_mud_port(), tls_error(t) )); PP(( "TLS on %O: %O\n", port, tls_error(t) ));
} }
} }
#endif // fall thru #endif // fall thru
@ -125,7 +131,7 @@ object connect(int uid, int port, string service) {
# endif # endif
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
#endif // fall thru #endif // fall thru
#if HAS_PORT(SPYC_PORT, SPYC_PATH) #if HAS_PORT(SPYC_PORT, SPYC_PATH)
case SPYC_PORT: case SPYC_PORT:
@ -162,7 +168,7 @@ object connect(int uid, int port, string service) {
case POP3S_PORT: case POP3S_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
return clone_object(POP3_PATH "server"); return clone_object(POP3_PATH "server");
#endif #endif
#if HAS_PORT(POP3_PORT, POP3_PATH) #if HAS_PORT(POP3_PORT, POP3_PATH)
@ -174,7 +180,7 @@ object connect(int uid, int port, string service) {
case SMTPS_PORT: case SMTPS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
return clone_object(SMTP_PATH "server"); return clone_object(SMTP_PATH "server");
#endif #endif
#if HAS_PORT(SMTP_PORT, SMTP_PATH) #if HAS_PORT(SMTP_PORT, SMTP_PATH)
@ -192,7 +198,7 @@ object connect(int uid, int port, string service) {
case NNTPS_PORT: case NNTPS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
return clone_object(NNTP_PATH "server"); return clone_object(NNTP_PATH "server");
#endif #endif
#if HAS_PORT(NNTP_PORT, NNTP_PATH) #if HAS_PORT(NNTP_PORT, NNTP_PATH)
@ -204,7 +210,7 @@ object connect(int uid, int port, string service) {
case JABBERS_PORT: case JABBERS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
return clone_object(JABBER_PATH "server"); return clone_object(JABBER_PATH "server");
#endif #endif
#if HAS_PORT(JABBER_PORT, JABBER_PATH) #if HAS_PORT(JABBER_PORT, JABBER_PATH)
@ -262,7 +268,7 @@ object connect(int uid, int port, string service) {
case IRCS_PORT: case IRCS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
return clone_object(IRC_PATH "server"); return clone_object(IRC_PATH "server");
#endif #endif
#if HAS_PORT(IRC_PORT, IRC_PATH) #if HAS_PORT(IRC_PORT, IRC_PATH)
@ -285,7 +291,7 @@ object connect(int uid, int port, string service) {
case TELNETS_PORT: case TELNETS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
// we could do the UID2NICK thing here, too, but why should we? // we could do the UID2NICK thing here, too, but why should we?
// what do you need tls for on a localhost tcp link? // what do you need tls for on a localhost tcp link?
return clone_object(TELNET_PATH "server"); return clone_object(TELNET_PATH "server");
@ -300,12 +306,15 @@ object connect(int uid, int port, string service) {
return t; return t;
#endif #endif
#if HAS_PORT(HTTP_PORT, HTTP_PATH) && AUTODETECT
case HTTP_PORT: // AUTODETECT on the HTTP port
#endif
#if HAS_PORT(HTTPS_PORT, HTTP_PATH) #if HAS_PORT(HTTPS_PORT, HTTP_PATH)
case HTTPS_PORT: case HTTPS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0) { if (t < 0) {
D1( if (t != ERR_TLS_NOT_DETECTED) PP(( "TLS(%O) on %O: %O\n", D1( if (t != ERR_TLS_NOT_DETECTED) PP(( "TLS(%O) on %O: %O\n",
t, query_mud_port(), tls_error(t) )); ) t, port, tls_error(t) )); )
#if !HAS_PORT(HTTP_PORT, HTTP_PATH) #if !HAS_PORT(HTTP_PORT, HTTP_PATH)
// if we have no http port, it may be intentional // if we have no http port, it may be intentional
return (object)0; return (object)0;
@ -316,8 +325,8 @@ object connect(int uid, int port, string service) {
return clone_object(HTTP_PATH "server"); return clone_object(HTTP_PATH "server");
#endif #endif
/* don't fall thru. allow for https: to be available without http: */ /* don't fall thru. allow for https: to be available without http: */
#if HAS_PORT(HTTP_PORT, HTTP_PATH) #if HAS_PORT(HTTP_PORT, HTTP_PATH) &&! AUTODETECT
case HTTP_PORT: // AUTODETECT on the HTTP port? we could do that too case HTTP_PORT:
return clone_object(HTTP_PATH "server"); return clone_object(HTTP_PATH "server");
#endif #endif
@ -325,7 +334,7 @@ object connect(int uid, int port, string service) {
case MUDS_PORT: case MUDS_PORT:
t = tls_init_connection(this_object()); t = tls_init_connection(this_object());
if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n", if (t < 0 && t != ERR_TLS_NOT_DETECTED) PP(( "TLS on %O: %O\n",
query_mud_port(), tls_error(t) )); port, tls_error(t) ));
return clone_object(MUD_PATH "login"); return clone_object(MUD_PATH "login");
#endif #endif
#if HAS_PORT(MUD_PORT, MUD_PATH) #if HAS_PORT(MUD_PORT, MUD_PATH)
@ -337,7 +346,7 @@ object connect(int uid, int port, string service) {
} }
PP(("Received connection on port %O which isn't configured.\n", PP(("Received connection on port %O which isn't configured.\n",
query_mud_port())); port));
return (object)0; return (object)0;
} }
@ -345,10 +354,10 @@ object connect(int uid, int port, string service) {
#ifdef DRIVER_HAS_RENAMED_CLONES #ifdef DRIVER_HAS_RENAMED_CLONES
// named clones -lynx // named clones -lynx
object compile_object(string file) { object compile_object(string file) {
P3((">> compile_object(%O)\n", file))
string path, name; string path, name;
object rob; object rob;
P3((">> compile_object(%O)\n", file))
# ifdef PSYC_PATH # ifdef PSYC_PATH
if (abbrev("S:psyc:", file)) { if (abbrev("S:psyc:", file)) {
rob = clone_object(PSYC_PATH "server"); rob = clone_object(PSYC_PATH "server");

2
world/net/twitter/client.c
View file

@ -34,7 +34,7 @@ object load(object usr, string key, string secret, string request, string access
void parse_status_update(string body, string headers, int http_status) { void parse_status_update(string body, string headers, int http_status) {
P3(("twitter/client:parse_status_update(%O, %O, %O)\n", body, headers, http_status)) P3(("twitter/client:parse_status_update(%O, %O, %O)\n", body, headers, http_status))
if (http_status != R_OK) if (http_status != R_OK)
sendmsg(user, "_error_"+name+"_status_update", "Error: failed to post status update on [_name].", (["_name": display_name])); sendmsg(user, "_failure_update_"+ name, "Unable to post status update on [_name].", (["_name": display_name]));
} }
void status_update(string text) { void status_update(string text) {