diff options
| author | Luiz Eduardo Gava <luiz.gava@procempa.com.br> | 2016-11-08 19:44:35 +0300 |
|---|---|---|
| committer | Luiz Eduardo Gava <luiz.gava@procempa.com.br> | 2016-11-08 19:44:35 +0300 |
| commit | ced0856ab1573d698c85c53069162aac7a3d5c50 (patch) | |
| tree | 656d5b645a2977a8c1d9c7c099f26954d3b556bc | |
| parent | 8520502707f45d8476c9d6b668b942ead5681400 (diff) | |
HTTPS /wiki redir to 443 (test)
| -rw-r--r-- | src/Cedar/Protocol.c | 12 | ||||
| -rw-r--r-- | src/Mayaqua/Network.c | 65 | ||||
| -rw-r--r-- | src/Mayaqua/Network.h | 1 |
3 files changed, 75 insertions, 3 deletions
diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c index 6d23e5c4..e0736060 100644 --- a/src/Cedar/Protocol.c +++ b/src/Cedar/Protocol.c @@ -6069,8 +6069,9 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str) SOCK *s;
UINT num = 0, max = 19;
SERVER *server;
+ char hostname[64];
char *vpn_http_target = HTTP_VPN_TARGET2;
- bool check_hostname = false;
+ bool check_hostname = true;
// Validate arguments
if (c == NULL)
{
@@ -6078,7 +6079,7 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str) }
-
+ strcpy(hostname, "");
server = c->Cedar->Server;
s = c->FirstSock;
@@ -6108,7 +6109,6 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str) if (check_hostname && (StrCmpi(h->Version, "HTTP/1.1") == 0 || StrCmpi(h->Version, "HTTP/1.2") == 0))
{
HTTP_VALUE *v;
- char hostname[64];
Zero(hostname, sizeof(hostname));
@@ -6343,6 +6343,12 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str) }
}
+ if ((b == false) && (StartWith(h->Target, "/wiki")))
+ {
+ HttpSendRedirect(s, h->Target, hostname);
+ b = true;
+ }
+
if (b == false)
{
// Not Found
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c index 0a7a321a..609540fd 100644 --- a/src/Mayaqua/Network.c +++ b/src/Mayaqua/Network.c @@ -187,6 +187,8 @@ struct ROUTE_CHANGE_DATA // HTTP constant
+//static char http_301_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>301 Moved Permanently</TITLE>\r\n</HEAD><BODY>\r\n<H1>Moved</H1>\r\nThis páge has moved to <A HREF=\"https://$HOST$:4443$TARGET$\">new address</A>.<P>\r\n<HR>\r\n</BODY></HTML>\r\n";
+static char http_301_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>301 Moved Permanently</TITLE>\r\n</HEAD><BODY>\r\n<H1>Moved</H1>\r\nThis páge has moved to <A HREF=\"https://$HOSTNAME$:4443$TARGET$\">new address</A>.<P>\r\n<HR>\r\n</BODY></HTML>\r\n";
static char http_404_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>404 Not Found</TITLE>\r\n</HEAD><BODY>\r\n<H1>Not Found</H1>\r\nThe requested URL $TARGET$ was not found on this server.<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
static char http_403_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>403 Forbidden</TITLE>\r\n</HEAD><BODY>\r\n<H1>Forbidden</H1>\r\nYou don't have permission to access $TARGET$\r\non this server.<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
static char http_500_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>500 Server Error</TITLE>\r\n</HEAD><BODY>\r\n<H1>Server Error</H1>\r\nServer Error<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
@@ -21857,6 +21859,69 @@ bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version) return ret;
}
+// Sending the 301 Moved Permanently: Redirect
+bool HttpSendRedirect(SOCK *s, char *target, char *hostname)
+{
+ HTTP_HEADER *h;
+ char *str;
+ //char *redirect_to_static="https://$HOSTNAME$:4443$TARGET$";
+ char *redirect_to_static="https://%s:4443%s";
+ char *redirect_to;
+ UINT redir_size;
+ UINT str_size;
+ bool ret;
+ char host[MAX_SIZE];
+ UINT port;
+ // Validate arguments
+ if (s == NULL || target == NULL || hostname == NULL)
+ {
+ return false;
+ }
+
+ // Get the host name
+ //GetMachineName(host, MAX_SIZE);
+ Zero(host, sizeof(host));
+ IPToStr(host, sizeof(host), &s->LocalIP);
+
+ // Creating a header
+ h = NewHttpHeader("HTTP/1.1", "301", "Moved Permanently");
+
+ redir_size = strlen(redirect_to_static) * 2 + StrLen(target) + StrLen(hostname);
+ redirect_to = Malloc(redir_size);
+ snprintf(redirect_to, redir_size, redirect_to_static, hostname, target);
+ //StrCpy(redirect_to, redir_size, redirect_to_static);
+ //ReplaceStri(redirect_to, redir_size, redirect_to, "$TARGET$", target);
+ //ReplaceStri(redirect_to, redir_size, redirect_to, "$HOSTNAME$", hostname);
+
+ AddHttpValue(h, NewHttpValue("Location", redirect_to));
+ AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
+
+ // Creating a Data
+ str_size = sizeof(http_301_str) * 2 + StrLen(target) + StrLen(hostname);
+ str = Malloc(str_size);
+ StrCpy(str, str_size, http_301_str);
+
+ // TARGET
+ ReplaceUnsafeCharInTarget(target);
+ ReplaceStri(str, str_size, str, "$TARGET$", target);
+
+ // HOST
+ //ReplaceStri(str, str_size, str, "$HOST$", host);
+
+ // HOSTNAME
+ ReplaceStri(str, str_size, str, "$HOSTNAME$", hostname);
+
+ // Transmission
+ ret = PostHttp(s, h, str, StrLen(str));
+
+ FreeHttpHeader(h);
+ Free(redirect_to);
+ Free(str);
+
+ return ret;
+}
+
+
// Sending a 404 Not Found error
bool HttpSendNotFound(SOCK *s, char *target)
{
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index bb4c69b7..6d579f8e 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -1043,6 +1043,7 @@ char *HttpHeaderToStr(HTTP_HEADER *header); bool PostHttp(SOCK *s, HTTP_HEADER *header, void *post_data, UINT post_size);
UINT GetContentLength(HTTP_HEADER *header);
void GetHttpDateStr(char *str, UINT size, UINT64 t);
+bool HttpSendRedirect(SOCK *s, char *target, char* hostname);
bool HttpSendForbidden(SOCK *s, char *target, char *server_id);
bool HttpSendNotFound(SOCK *s, char *target);
bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version);
|