Merge pull request #375 from RunOnFlux/development

v3.0.4

HomeUI/dist/index.html

@@ -83,7 +83,7 @@
     transform: rotate(1turn);
     opacity: 1;
   }
-}</style><link rel="icon" href="/logo.png" type="image/x-icon"><link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap" rel="stylesheet"><title>FluxOS Dashboard</title><link href="/css/chunk-049e28b4.css" rel="prefetch"><link href="/css/chunk-089f62c4.css" rel="prefetch"><link href="/css/chunk-11167d93.css" rel="prefetch"><link href="/css/chunk-1c76f7fe.css" rel="prefetch"><link href="/css/chunk-1fb3aa5d.css" rel="prefetch"><link href="/css/chunk-238f14a8.css" rel="prefetch"><link href="/css/chunk-2b6840ea.css" rel="prefetch"><link href="/css/chunk-2e4305fd.css" rel="prefetch"><link href="/css/chunk-2f037878.css" rel="prefetch"><link href="/css/chunk-377903a4.css" rel="prefetch"><link href="/css/chunk-3bddc606.css" rel="prefetch"><link href="/css/chunk-448594c3.css" rel="prefetch"><link href="/css/chunk-44a48fcb.css" rel="prefetch"><link href="/css/chunk-4ba4f37c.css" rel="prefetch"><link href="/css/chunk-4d0d7446.css" rel="prefetch"><link href="/css/chunk-50ab797a.css" rel="prefetch"><link href="/css/chunk-56bfc1e1.css" rel="prefetch"><link href="/css/chunk-57cc3794.css" rel="prefetch"><link href="/css/chunk-586caf0d.css" rel="prefetch"><link href="/css/chunk-593d700c.css" rel="prefetch"><link href="/css/chunk-5fed373c.css" rel="prefetch"><link href="/css/chunk-66546a30.css" rel="prefetch"><link href="/css/chunk-68c6ed17.css" rel="prefetch"><link href="/css/chunk-74da2b58.css" rel="prefetch"><link href="/css/chunk-7c77c1e2.css" rel="prefetch"><link href="/css/chunk-829f4c26.css" rel="prefetch"><link href="/css/chunk-84a82956.css" rel="prefetch"><link href="/css/chunk-b2383f76.css" rel="prefetch"><link href="/css/chunk-cb06fb70.css" rel="prefetch"><link href="/css/chunk-f4e44914.css" rel="prefetch"><link href="/css/chunk-f742bcf2.css" rel="prefetch"><link href="/css/chunk-f8d17ac2.css" rel="prefetch"><link href="/css/chunk-ff4818f0.css" rel="prefetch"><link href="/js/chunk-049e28b4.js" rel="prefetch"><link href="/js/chunk-089f62c4.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0c9d4aae.js" rel="prefetch"><link href="/js/chunk-0fdab1f5.js" rel="prefetch"><link href="/js/chunk-11167d93.js" rel="prefetch"><link href="/js/chunk-18c81973.js" rel="prefetch"><link href="/js/chunk-1c76f7fe.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1fb3aa5d.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-238f14a8.js" rel="prefetch"><link href="/js/chunk-255299ca.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-2928c9ba.js" rel="prefetch"><link href="/js/chunk-292e506e.js" rel="prefetch"><link href="/js/chunk-2a15b404.js" rel="prefetch"><link href="/js/chunk-2b6840ea.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-2e4305fd.js" rel="prefetch"><link href="/js/chunk-2f037878.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-377903a4.js" rel="prefetch"><link href="/js/chunk-3bddc606.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-41b45156.js" rel="prefetch"><link href="/js/chunk-448594c3.js" rel="prefetch"><link href="/js/chunk-44a48fcb.js" rel="prefetch"><link href="/js/chunk-45eb91e0.js" rel="prefetch"><link href="/js/chunk-49419389.js" rel="prefetch"><link href="/js/chunk-4ba4f37c.js" rel="prefetch"><link href="/js/chunk-4d0d7446.js" rel="prefetch"><link href="/js/chunk-50ab797a.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-56bfc1e1.js" rel="prefetch"><link href="/js/chunk-57cc3794.js" rel="prefetch"><link href="/js/chunk-586caf0d.js" rel="prefetch"><link href="/js/chunk-593d700c.js" rel="prefetch"><link href="/js/chunk-5a60f0de.js" rel="prefetch"><link href="/js/chunk-5b67c44c.js" rel="prefetch"><link href="/js/chunk-5fed373c.js" rel="prefetch"><link href="/js/chunk-623dc2e1.js" rel="prefetch"><link href="/js/chunk-64f322df.js" rel="prefetch"><link href="/js/chunk-650d0bfc.js" rel="prefetch"><link href="/js/chunk-66546a30.js" rel="prefetch"><link href="/js/chunk-68c6ed17.js" rel="prefetch"><link href="/js/chunk-69bcc4fe.js" rel="prefetch"><link href="/js/chunk-6fff6798.js" rel="prefetch"><link href="/js/chunk-70d6337e.js" rel="prefetch"><link href="/js/chunk-72cac487.js" rel="prefetch"><link href="/js/chunk-74da2b58.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7c77c1e2.js" rel="prefetch"><link href="/js/chunk-7db479ac.js" rel="prefetch"><link href="/js/chunk-7fc4780e.js" rel="prefetch"><link href="/js/chunk-829f4c26.js" rel="prefetch"><link href="/js/chunk-84a82956.js" rel="prefetch"><link href="/js/chunk-b2383f76.js" rel="prefetch"><link href="/js/chunk-cb06fb70.js" rel="prefetch"><link href="/js/chunk-cb4887ac.js" rel="prefetch"><link href="/js/chunk-ceeb5c8c.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-e696eef4.js" rel="prefetch"><link href="/js/chunk-f4e44914.js" rel="prefetch"><link href="/js/chunk-f742bcf2.js" rel="prefetch"><link href="/js/chunk-f8b79a3e.js" rel="prefetch"><link href="/js/chunk-f8d17ac2.js" rel="prefetch"><link href="/js/chunk-ff4818f0.js" rel="prefetch"><link href="/css/index.css" rel="preload" as="style"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/js/index.js" rel="preload" as="script"><link href="/css/index.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but the FluxOS Dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="loading-bg"><div class="loading-logo"><img src="/logo.png" alt="Logo"></div><div class="loading"><div class="effect-1 effects"></div><div class="effect-2 effects"></div><div class="effect-3 effects"></div></div></div><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/index.js"></script></body><script>var skin = localStorage.getItem('vuexy-skin') || 'dark';
+}</style><link rel="icon" href="/logo.png" type="image/x-icon"><link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap" rel="stylesheet"><title>FluxOS Dashboard</title><link href="/css/chunk-049e28b4.css" rel="prefetch"><link href="/css/chunk-089f62c4.css" rel="prefetch"><link href="/css/chunk-11167d93.css" rel="prefetch"><link href="/css/chunk-1c76f7fe.css" rel="prefetch"><link href="/css/chunk-1fb3aa5d.css" rel="prefetch"><link href="/css/chunk-238f14a8.css" rel="prefetch"><link href="/css/chunk-2917bda4.css" rel="prefetch"><link href="/css/chunk-2b6840ea.css" rel="prefetch"><link href="/css/chunk-2e4305fd.css" rel="prefetch"><link href="/css/chunk-2f037878.css" rel="prefetch"><link href="/css/chunk-377903a4.css" rel="prefetch"><link href="/css/chunk-3bddc606.css" rel="prefetch"><link href="/css/chunk-448594c3.css" rel="prefetch"><link href="/css/chunk-44a48fcb.css" rel="prefetch"><link href="/css/chunk-4ba4f37c.css" rel="prefetch"><link href="/css/chunk-4d0d7446.css" rel="prefetch"><link href="/css/chunk-50ab797a.css" rel="prefetch"><link href="/css/chunk-56bfc1e1.css" rel="prefetch"><link href="/css/chunk-57cc3794.css" rel="prefetch"><link href="/css/chunk-586caf0d.css" rel="prefetch"><link href="/css/chunk-593d700c.css" rel="prefetch"><link href="/css/chunk-5fed373c.css" rel="prefetch"><link href="/css/chunk-66546a30.css" rel="prefetch"><link href="/css/chunk-68c6ed17.css" rel="prefetch"><link href="/css/chunk-7c77c1e2.css" rel="prefetch"><link href="/css/chunk-829f4c26.css" rel="prefetch"><link href="/css/chunk-84a82956.css" rel="prefetch"><link href="/css/chunk-b2383f76.css" rel="prefetch"><link href="/css/chunk-cb06fb70.css" rel="prefetch"><link href="/css/chunk-f4e44914.css" rel="prefetch"><link href="/css/chunk-f742bcf2.css" rel="prefetch"><link href="/css/chunk-f8d17ac2.css" rel="prefetch"><link href="/css/chunk-ff4818f0.css" rel="prefetch"><link href="/js/chunk-049e28b4.js" rel="prefetch"><link href="/js/chunk-089f62c4.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0c9d4aae.js" rel="prefetch"><link href="/js/chunk-0fdab1f5.js" rel="prefetch"><link href="/js/chunk-11167d93.js" rel="prefetch"><link href="/js/chunk-18c81973.js" rel="prefetch"><link href="/js/chunk-1c76f7fe.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1fb3aa5d.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-238f14a8.js" rel="prefetch"><link href="/js/chunk-255299ca.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-2917bda4.js" rel="prefetch"><link href="/js/chunk-2928c9ba.js" rel="prefetch"><link href="/js/chunk-292e506e.js" rel="prefetch"><link href="/js/chunk-2a15b404.js" rel="prefetch"><link href="/js/chunk-2b6840ea.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-2e4305fd.js" rel="prefetch"><link href="/js/chunk-2f037878.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-377903a4.js" rel="prefetch"><link href="/js/chunk-3bddc606.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-41b45156.js" rel="prefetch"><link href="/js/chunk-448594c3.js" rel="prefetch"><link href="/js/chunk-44a48fcb.js" rel="prefetch"><link href="/js/chunk-45eb91e0.js" rel="prefetch"><link href="/js/chunk-49419389.js" rel="prefetch"><link href="/js/chunk-4ba4f37c.js" rel="prefetch"><link href="/js/chunk-4d0d7446.js" rel="prefetch"><link href="/js/chunk-50ab797a.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-56bfc1e1.js" rel="prefetch"><link href="/js/chunk-57cc3794.js" rel="prefetch"><link href="/js/chunk-586caf0d.js" rel="prefetch"><link href="/js/chunk-593d700c.js" rel="prefetch"><link href="/js/chunk-5a60f0de.js" rel="prefetch"><link href="/js/chunk-5b67c44c.js" rel="prefetch"><link href="/js/chunk-5fed373c.js" rel="prefetch"><link href="/js/chunk-623dc2e1.js" rel="prefetch"><link href="/js/chunk-64f322df.js" rel="prefetch"><link href="/js/chunk-650d0bfc.js" rel="prefetch"><link href="/js/chunk-66546a30.js" rel="prefetch"><link href="/js/chunk-68c6ed17.js" rel="prefetch"><link href="/js/chunk-69bcc4fe.js" rel="prefetch"><link href="/js/chunk-6fff6798.js" rel="prefetch"><link href="/js/chunk-70d6337e.js" rel="prefetch"><link href="/js/chunk-72cac487.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7c77c1e2.js" rel="prefetch"><link href="/js/chunk-7db479ac.js" rel="prefetch"><link href="/js/chunk-7fc4780e.js" rel="prefetch"><link href="/js/chunk-829f4c26.js" rel="prefetch"><link href="/js/chunk-84a82956.js" rel="prefetch"><link href="/js/chunk-b2383f76.js" rel="prefetch"><link href="/js/chunk-cb06fb70.js" rel="prefetch"><link href="/js/chunk-cb4887ac.js" rel="prefetch"><link href="/js/chunk-ceeb5c8c.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-e696eef4.js" rel="prefetch"><link href="/js/chunk-f4e44914.js" rel="prefetch"><link href="/js/chunk-f742bcf2.js" rel="prefetch"><link href="/js/chunk-f8b79a3e.js" rel="prefetch"><link href="/js/chunk-f8d17ac2.js" rel="prefetch"><link href="/js/chunk-ff4818f0.js" rel="prefetch"><link href="/css/index.css" rel="preload" as="style"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/js/index.js" rel="preload" as="script"><link href="/css/index.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but the FluxOS Dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="loading-bg"><div class="loading-logo"><img src="/logo.png" alt="Logo"></div><div class="loading"><div class="effect-1 effects"></div><div class="effect-2 effects"></div><div class="effect-3 effects"></div></div></div><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/index.js"></script></body><script>var skin = localStorage.getItem('vuexy-skin') || 'dark';
     if (skin === 'dark') {
       document.body.classList.add('dark-layout')
     } else if (document.body.className.match('dark-layout')) {

HomeUI/src/views/apps/RegisterFluxApp.vue

@@ -2,7 +2,7 @@
   <div>
     <b-card>
       <b-card-sub-title>
-        Note: Only verified developers and images can currently run on Flux. To become a verified developer with whitelisted images, please contact the Flux Team via
+        Note: Only verified images can currently run on Flux. To whitelist your image, please contact the Flux Team via
         <b-link
           href="https://discord.io/runonflux"
           target="_blank"

ZelBack/src/services/appsService.js

@@ -2790,6 +2790,22 @@ function verifyCorrectnessOfApp(appSpecification) {
     throw new Error('Missing Flux App specification parameter');
   }
 
+  if (typeof version !== 'number') {
+    throw new Error('Invalid Flux App version');
+  }
+
+  if (typeof name !== 'string') {
+    throw new Error('Invalid Flux App name');
+  }
+
+  if (typeof description !== 'string') {
+    throw new Error('Invalid Flux App description');
+  }
+
+  if (typeof owner !== 'string') {
+    throw new Error('Invalid Flux App owner');
+  }
+
   if (version === 1) {
     if (!port || !containerPort) {
       throw new Error('Missing Flux App specification parameter');
@@ -2884,6 +2900,12 @@ function verifyCorrectnessOfApp(appSpecification) {
       throw new Error('Flux App has too many components');
     }
     compose.forEach((appComponent) => {
+      if (typeof appComponent.name !== 'string') {
+        throw new Error('Invalid Flux App component name');
+      }
+      if (typeof appComponent.description !== 'string') {
+        throw new Error(`Invalid Flux App component ${appComponent.name} description`);
+      }
       if (Array.isArray(appComponent.ports)) {
         appComponent.ports.forEach((parameter) => {
           if (typeof parameter !== 'number') {
@@ -3255,8 +3277,10 @@ async function verifyAppSpecifications(appSpecifications, height) {
       });
     });
   }
-  // check ZelID whitelisted
-  await generalService.checkWhitelistedZelID(appSpecifications.owner);
+  if (height < 1004000) {
+    // check ZelID whitelisted
+    await generalService.checkWhitelistedZelID(appSpecifications.owner);
+  }
 }
 
 async function assignedPortsApps() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flux",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Flux, Your Gateway to a Decentralized World",
   "repository": {
     "type": "git",