+
# Description
diff --git a/docker-compose.yml b/docker-compose.yml
index f847f77b..75c7bb96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,14 @@ services:
restart: always
ports:
- "80:80"
+ volumes:
+ - "storage:/app/storage"
+
+ # If using the Volume Manager to access volumes on other containers, ensure this container `depends_on` your
+ # other container using the below:
+ # depends_on:
+ # - "your-other-container-name"
+
labels:
io.balena.features.supervisor-api: 1
io.balena.features.balena-api: 1
@@ -33,3 +41,6 @@ services:
cap_add:
- NET_ADMIN
privileged: true # This can be removed if you do not need the LED indicator.
+
+volumes:
+ storage:
diff --git a/expressjs/package.json b/expressjs/package.json
index bb1578c2..99b6faab 100644
--- a/expressjs/package.json
+++ b/expressjs/package.json
@@ -13,10 +13,13 @@
"build": "yarn tsc -p ."
},
"dependencies": {
- "axios": "^0.25.0",
+ "axios": "^0.26.0",
"balena-sdk": "^16.13.4",
"cors": "^2.8.5",
"express": "^4.17.2",
+ "formidable": "^2.0.1",
+ "fs-extra": "^10.0.0",
+ "klaw-sync": "^6.0.0",
"lockfile": "^1.0.4",
"lodash": "^4.17.21",
"winston": "^3.6.0"
@@ -24,6 +27,9 @@
"devDependencies": {
"@types/cors": "^2.8.12",
"@types/express": "^4.17.13",
+ "@types/formidable": "^2.0.4",
+ "@types/fs-extra": "^9.0.13",
+ "@types/klaw-sync": "^6.0.1",
"@types/lockfile": "^1.0.2",
"@types/node": "^17.0.17",
"@typescript-eslint/eslint-plugin": "^5.11.0",
diff --git a/expressjs/src/index.ts b/expressjs/src/index.ts
index fc034335..375367ce 100644
--- a/expressjs/src/index.ts
+++ b/expressjs/src/index.ts
@@ -2,6 +2,7 @@ import cors from 'cors'
import express from 'express'
import BalenaSDKRoutes from './routes/BalenaSDKRoutes'
import CustomRoutes from './routes/CustomRoutes'
+import FilemanagerRoutes from './routes/FilemanagerRoutes'
import SupervisorRoutes from './routes/SupervisorRoutes'
import TestRoutes from './routes/TestRoutes'
import WifiRoutes from './routes/WifiConnectRoutes'
@@ -16,11 +17,12 @@ app.locals.defaultCacheTimeout = 0 // Default cache timeout used when none is pr
app.use(cors())
app.use(express.json())
app.use(express.urlencoded({ extended: true }))
-app.use(express.static('public'))
+app.use(express.static('public', { dotfiles: 'allow' }))
// Routes
app.use(BalenaSDKRoutes)
app.use(CustomRoutes)
+app.use(FilemanagerRoutes)
app.use(SupervisorRoutes)
app.use(WifiRoutes)
diff --git a/expressjs/src/routes/FilemanagerRoutes.ts b/expressjs/src/routes/FilemanagerRoutes.ts
new file mode 100644
index 00000000..9b40396d
--- /dev/null
+++ b/expressjs/src/routes/FilemanagerRoutes.ts
@@ -0,0 +1,112 @@
+import Logger from '../common/logger'
+import express from 'express'
+import formidable from 'formidable'
+import fse from 'fs-extra'
+import klawSync, { Item } from 'klaw-sync'
+import path from 'path'
+
+const router = express.Router()
+
+// Root directory files
+// `path.join` sterilizes paths to prevent manipulation of root dir
+const rootDir = path.join(__dirname + '/../storage/')
+
+// Prevent Directory Traversal
+// https://nodejs.org/en/knowledge/file-system/security/introduction/#preventing-directory-traversal
+function validatePath(path: string) {
+ if (path.indexOf(rootDir) !== 0) {
+ Logger.warn('User attempting to reach out of the root dir?')
+ throw new Error('User attempting to reach out of the root dir?')
+ }
+ return path
+}
+
+// Ignore hidden directories and files
+const filterFn = (item: Item) => {
+ const basename = path.basename(item.path)
+ return basename === '.' || basename[0] !== '.'
+}
+
+// Fetch files
+function fetchList(currentPath: Array{{ response.data }}
diff --git a/ui/src/components/EnvConfig.vue b/ui/src/components/EnvConfig.vue
index fe4989bc..d181ab38 100644
--- a/ui/src/components/EnvConfig.vue
+++ b/ui/src/components/EnvConfig.vue
@@ -5,7 +5,7 @@
flat
bordered
separator="cell"
- :title="$t('environment_variables')"
+ :title="$t('deviceInfo.environment_variables')"
:rows="getEnvResponse.data"
:columns="columns"
row-key="name"
@@ -14,8 +14,8 @@
{{ getEnvResponse.data }}