api: prefer profile directly over mapped one

Within OpenWrt the profile does not always matches the `board_name`, which is determined via device tree files. As a workaround ASU automatically parsed the "supported" devices and mapped incomming requests to profiles. In some rare cases (#319) the support profile is actually a different profile than the one installed, in this case a device that support images with and without nand storage. To fix this, first check if a profile with the device tree model exists (by replacing `,` with `_`) and only use the *supported mapping* if it does not. Fixes: #319 Signed-off-by: Paul Spooren <[email protected]>
openwrt · Feb 28, 2022 · b321575 · b321575
1 parent 42c69bf
commit b321575
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/asu/api.py b/asu/api.py
@@ -239,25 +239,25 @@ def validate_request(req):
         current_app.logger.debug("Use generic profile for {req['target']}")
         req["profile"] = "generic"
     else:
-        mapped_profile = r.hget(
-            f"mapping-{req['branch']}-{req['version']}-{req['target']}",
-            req["profile"],
-        )
-
-        if mapped_profile:
-            req["profile"] = mapped_profile.decode()
-
-        current_app.logger.debug("Profile after mapping " + req["profile"])
-
-        if not r.sismember(
+        if r.sismember(
             f"profiles-{req['branch']}-{req['version']}-{req['target']}",
-            req["profile"],
+            req["profile"].replace(",", "_"),
         ):
-            return (
-                {"detail": f"Unsupported profile: {req['profile']}", "status": 400},
-                400,
+            req["profile"] = req["profile"].replace(",", "_")
+        else:
+            mapped_profile = r.hget(
+                f"mapping-{req['branch']}-{req['version']}-{req['target']}",
+                req["profile"],
             )
 
+            if mapped_profile:
+                req["profile"] = mapped_profile.decode()
+            else:
+                return (
+                    {"detail": f"Unsupported profile: {req['profile']}", "status": 400},
+                    400,
+                )
+
     package_problems = validate_packages(req)
     if package_problems:
         return package_problems