Allowed relative path with theme_utils.dirlist

.editorconfig

@@ -14,6 +14,9 @@ max_line_length          = 99
 tab_width                = 4
 trim_trailing_whitespace = true
 
+[*.js]
+indent_style = space
+
 [*.py]
 indent_style = space
 

web-greeter/bridge/ThemeUtils.py

@@ -46,6 +46,7 @@ class ThemeUtils(BridgeObject):
         self._greeter = greeter
 
         self._allowed_dirs = (
+            os.path.dirname(self._config["config"]["greeter"]["theme"]),
             self._config["app"]["theme_dir"],
             self._config["config"]["branding"]["background_images_dir"],
             self._greeter.shared_data_directory,
@@ -57,6 +58,9 @@ class ThemeUtils(BridgeObject):
         if not dir_path or not isinstance(dir_path, str) or '/' == dir_path:
             return []
 
+        if (dir_path.startswith("./")):
+            dir_path = os.path.join(os.path.dirname(self._config["config"]["greeter"]["theme"]), dir_path)
+
         dir_path = os.path.realpath(os.path.normpath(dir_path))
 
         if not os.path.isabs(dir_path) or not os.path.isdir(dir_path):

web-greeter/resources/js/ThemeUtils.js

@@ -25,11 +25,9 @@
  * along with web-greeter; If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 let time_language = null,
     _ThemeUtils = null;
 
-
 /**
  * Provides various utility methods for use in greeter themes. The greeter will automatically
  * create an instance of this class when it starts. The instance can be accessed
@@ -38,11 +36,11 @@ let time_language = null,
  * @memberOf LightDM
  */
 class ThemeUtils {
-
-	constructor( instance ) {
-		if ( null !== _ThemeUtils ) {
-			return _ThemeUtils;
+    constructor(instance) {
+        if (null !== _ThemeUtils) {
+            return _ThemeUti;
         }
+        ls;
 
         _ThemeUtils = instance;
     }
@@ -54,25 +52,27 @@ class ThemeUtils {
      *
      * @return {object} `context` with `this` bound to it for all of its methods.
      */
-	bind_this( context ) {
-		let excluded_methods = ['constructor'];
+    bind_this(context) {
+        let excluded_methods = ["constructor"];
 
-		function not_excluded( _method, _context ) {
-			let is_excluded = excluded_methods.findIndex( excluded_method => _method === excluded_method ) > -1,
-				is_method = 'function' === typeof _context[_method];
+        function not_excluded(_method, _context) {
+            let is_excluded =
+                    excluded_methods.findIndex((excluded_method) => _method === excluded_method) >
+                    -1,
+                is_method = "function" === typeof _context[_method];
 
             return is_method && !is_excluded;
         }
 
-		for ( let obj = context; obj; obj = Object.getPrototypeOf( obj ) ) {
+        for (let obj = context; obj; obj = Object.getPrototypeOf(obj)) {
             // Stop once we have traveled all the way up the inheritance chain
-			if ( 'Object' === obj.constructor.name ) {
+            if ("Object" === obj.constructor.name) {
                 break;
             }
 
-			for ( let method of Object.getOwnPropertyNames( obj ) ) {
-				if ( not_excluded( method, context ) ) {
-					context[method] = context[method].bind( context );
+            for (let method of Object.getOwnPropertyNames(obj)) {
+                if (not_excluded(method, context)) {
+                    context[method] = context[method].bind(context);
                 }
             }
         }
@@ -80,7 +80,6 @@ class ThemeUtils {
         return context;
     }
 
-
     /**
      * Returns the contents of directory found at `path` provided that the (normalized) `path`
      * meets at least one of the following conditions:
@@ -93,24 +92,22 @@ class ThemeUtils {
      * @param {boolean}             only_images Include only images in the results. Default `true`.
      * @param {function(string[])}  callback    Callback function to be called with the result.
      */
-	dirlist( path, only_images = true, callback ) {
-		if ( '' === path || 'string' !== typeof path ) {
+    dirlist(path, only_images = true, callback) {
+        if ("" === path || "string" !== typeof path) {
             console.error(`theme_utils.dirlist(): path must be a non-empty string!`);
             return callback([]);
-
-		} else if ( null !== path.match(/^[^/].+/) ) {
-			console.error(`theme_utils.dirlist(): path must be absolute!`);
-			return callback([]);
+        } else if (null !== path.match(/^[^/].+/)) {
+            return _ThemeUtils.dirlist(path, only_images, callback);
         }
 
-		if ( null !== path.match(/\/\.+(?=\/)/) ) {
+        if (null !== path.match(/\/\.+(?=\/)/)) {
             // No special directory names allowed (eg ../../)
-			path = path.replace(/\/\.+(?=\/)/g, '' );
+            path = path.replace(/\/\.+(?=\/)/g, "");
         }
 
         try {
-			return _ThemeUtils.dirlist( path, only_images, callback );
-		} catch( err ) {
+            return _ThemeUtils.dirlist(path, only_images, callback);
+        } catch (err) {
             console.error(`theme_utils.dirlist(): ${err}`);
             return callback([]);
         }
@@ -123,26 +120,26 @@ class ThemeUtils {
      * @returns {Object} The current date.
      */
     get_current_localized_date() {
-		let config = greeter_config.greeter
+        let config = greeter_config.greeter;
 
-		var locale = []
+        var locale = [];
 
         if (time_language === null) {
-			time_language = config.time_language || ""
+            time_language = config.time_language || "";
         }
 
         if (time_language != "") {
-			locale.push(time_language)
+            locale.push(time_language);
         }
 
-		let optionsDate = { day: "2-digit", month: "2-digit", year: "2-digit" }
+        let optionsDate = { day: "2-digit", month: "2-digit", year: "2-digit" };
 
-		let fmtDate = Intl.DateTimeFormat(locale, optionsDate)
+        let fmtDate = Intl.DateTimeFormat(locale, optionsDate);
 
-		let now = new Date()
-		var date = fmtDate.format(now)
+        let now = new Date();
+        var date = fmtDate.format(now);
 
-		return date
+        return date;
     }
 
     /**
@@ -152,25 +149,25 @@ class ThemeUtils {
      * @returns {Object} The current time.
      */
     get_current_localized_time() {
-		let config = greeter_config.greeter
+        let config = greeter_config.greeter;
 
-		var locale = []
+        var locale = [];
 
         if (time_language === null) {
-			time_language = config.time_language || ""
+            time_language = config.time_language || "";
         }
 
         if (time_language != "") {
-			locale.push(time_language)
+            locale.push(time_language);
         }
 
-		let optionsTime = { hour: "2-digit", minute: "2-digit" }
+        let optionsTime = { hour: "2-digit", minute: "2-digit" };
 
-		let fmtTime = Intl.DateTimeFormat(locale, optionsTime)
+        let fmtTime = Intl.DateTimeFormat(locale, optionsTime);
 
-		let now = new Date()
-		var time = fmtTime.format(now)
+        let now = new Date();
+        var time = fmtTime.format(now);
 
-		return time
+        return time;
     }
 }