X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Floader.php;h=2216d8ac012dd843c40fa5eeeb68f1471291504d;hb=e19231f39d9d6583cc5753dbd2638c597957fdd1;hp=121cbc9169135f2ea3b8a667347036c6919f790f;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/loader.php b/inc/modules/loader.php
index 121cbc9169..2216d8ac01 100644
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,23 +37,44 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Is an URL specified?
-if (isGetRequestParameterSet('url')) {
+if ((isGetRequestElementSet('url')) && (isGetRequestElementSet('hash')) && (isGetRequestElementSet('salt'))) {
 	// Decode URL
-	$url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestParameter('url')))));
+	$decodedUrl = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
 
-	// Validate the URL
-	if (isUrlValid($url)) {
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'decodedUrl=' . $decodedUrl . ',hash=' . getRequestElement('hash'));
+
+	// Generate hash for comparing it
+	$hash = encodeHashForCookie(generateHash($decodedUrl . getSiteKey() . getDateKey(), getRequestElement('salt')));
+
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'decodedUrl=' . $decodedUrl . ',hash=' . $hash);
+
+	// Validate the URL and hash
+	if ($hash != getRequestElement('hash')) {
+		// Hash doesn't match
+		displayMessage('{--LOADER_SECURITY_HASH_MISMATCH--}');
+
+		// Log this event
+		logDebugMessage(__FILE__, __LINE__, 'Hash ' . getRequestElement('hash') . ' does not match URL ' . $decodedUrl);
+	} elseif (isUrlValid($decodedUrl)) {
 		// Generate a JavaScript that redirects us
-		loadTemplate('loader', false, $url);
+		loadTemplate('loader', FALSE, $decodedUrl);
 	} else {
 		// URL invalid
 		redirectToUrl('modules.php?module=index');
 	}
 } else {
+	// Is the hash not provided?
+	if (!isGetRequestElementSet('hash')) {
+		// Very old (external!) call
+		logDebugMessage(__FUNCTION__, __LINE__, 'Possible old call on loader.php detected. Redirecting to index.php anyway ...');
+	} // END - if
+
 	// Invalid or no URL entered!
 	redirectToUrl('modules.php?module=index');
 }