apache gzip svg, _DEBUG_MODE, BadLoginException when bad JWT token

app.js

@@ -1,5 +1,11 @@
 
-require ('./env.js' );
+var host = window.location.host.split(':')[0];
+
+if (_DEV_MODE)
+	host = host +':8080';
+
+__webpack_public_path__ = '//'+ host +'/build/';
+
 require ('hedera/hedera');
 
 window.onload = function ()

conf/apache.conf

@@ -9,7 +9,7 @@
 	Order Allow,Deny
 	Allow From All
 
-	<FilesMatch "\.(css|js|json|php|xml|html)$">
+	<FilesMatch "\.(css|js|json|php|xml|html|svg)$">
 		SetOutputFilter DEFLATE
 	</FilesMatch>
 

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (1.387-deb8) stable; urgency=low
+hedera-web (1.388-deb8) stable; urgency=low
 
   * Initial Release.
 

env.js

@@ -1,8 +0,0 @@
-
-var host = window.location.host.split(':')[0];
-
-if (_DEV_MODE)
-	host = host +':8080';
-
-__webpack_public_path__ = '//'+ host +'/build/';
-

env.php

@@ -6,6 +6,7 @@ set_include_path (__DIR__.PATH_SEPARATOR.get_include_path ());
 
 $vnAutoloadMap['vn/web'] = __DIR__.'/web';
 
+const _ENABLE_DEBUG = FALSE;
 const _DEV_MODE = TRUE;
 const _CONFIG_DIR = __DIR__.'/../../.config';
 const _LOG_DIR = '/tmp';

pages/main/head.php

@@ -12,6 +12,6 @@ if ($result = $db->query ('SELECT name, content FROM metatag'))
 	$result->free ();
 }
 
-$url = _DEV_MODE ? "http://{$_SERVER['SERVER_NAME']}:8080" : '.';
+$url = _DEV_MODE ? "http://{$_SERVER['SERVER_NAME']}:8080/" : '';
-$this->includeJs ("$url/build/hedera-web.js");
+$this->includeJs ("{$url}build/hedera-web.js");
 

web/json-service.php

@@ -58,12 +58,12 @@ class JsonService extends RestService
 
 		$json = new JsonException ();
 		
-		if (_DEV_MODE || $errno & $eUser)
+		if (_ENABLE_DEBUG || $errno & $eUser)
 			$json->message = $message;
 		else
 			$json->message = s('Something went wrong');
 		
-		if (_DEV_MODE)
+		if (_ENABLE_DEBUG)
 		{
 			$json->code = $errno;
 			$json->file = $file;
@@ -91,7 +91,7 @@ class JsonService extends RestService
 	{
 		$json = new JsonException ();
 		
-		if (_DEV_MODE || $e instanceof Lib\UserException)
+		if (_ENABLE_DEBUG || $e instanceof Lib\UserException)
 		{
 			$json->exception = get_class ($e);
 			$json->message = $e->getMessage ();
@@ -102,12 +102,12 @@ class JsonService extends RestService
 			$json->message = s('Something went wrong');
 		}
 
-		if (_DEV_MODE)
+		if (_ENABLE_DEBUG)
 		{
 			$json->code = $e->getCode ();
 			$json->file = $e->getFile ();
 			$json->line = $e->getLine ();
-			$json->trace = $e->getTraceAsString ();
+			$json->trace = $e->getTrace ();
 		}
 
 		$this->statusFromException ($e);

web/rest-service.php

@@ -11,7 +11,7 @@ class RestService extends Service
 {
 	function run ()
 	{
-		ini_set ('display_errors', _DEV_MODE);
+		ini_set ('display_errors', _ENABLE_DEBUG);
 		set_error_handler ([$this, 'errorHandler'], E_ALL);
 		set_exception_handler ([$this, 'exceptionHandler']);
 

web/service.php

@@ -162,7 +162,15 @@ abstract class Service
 					$token = $_GET['token'];
 
 				$key = $db->getValue ('SELECT jwtKey FROM config');
-				$jwtPayload = Jwt::decode ($token, $key);
+
+				try {
+					$jwtPayload = Jwt::decode ($token, $key);
+				}
+				catch (\Exception $e)
+				{
+					throw new BadLoginException ($e->getMessage ());
+				}
+
 				$expiration = $jwtPayload['exp'];
 
 				if (empty ($expiration) || $expiration <= time())