Bump version

we generate a dynamic password because users might forget to change the admin password (with the oidc login being so click friendly)

CloudronManifest.json

@@ -5,10 +5,10 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "2.9.2",
-  "upstreamVersion": "2022-09-01T23-53-36Z",
+  "version": "3.13.12",
+  "upstreamVersion": "2024-04-28T17-53-50Z",
   "healthCheckPath": "/minio/login",
-  "memoryLimit": 805306368,
+  "memoryLimit": 2147483648,
   "httpPort": 8000,
   "httpPorts": {
     "API_SERVER_DOMAIN": {
@@ -19,8 +19,10 @@
     }
   },
   "addons": {
-    "localstorage": {}
+    "localstorage": {},
+    "oidc": { "loginRedirectUri": "/oauth_callback" }
   },
+  "optionalSso": true,
   "manifestVersion": 2,
   "website": "http://www.minio.io",
   "minBoxVersion": "7.1.2",

Dockerfile

@@ -1,16 +1,16 @@
-FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=RELEASE.2022-09-01T23-53-36Z
-ARG MC_VERSION=RELEASE.2022-08-28T20-08-11Z
+ARG VERSION=RELEASE.2024-04-28T17-53-50Z
 
 # sometimes here https://dl.min.io/server/minio/release/linux-amd64/archive/
-RUN wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio
+# RUN wget https://dl.min.io/server/minio/release/linux-amd64/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio
+RUN wget https://dl.min.io/server/minio/release/linux-amd64/archive/minio.${VERSION} -O /app/code/minio && chmod +x /app/code/minio
 # https://dl.min.io/client/mc/release/linux-amd64/
-RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc.${MC_VERSION} -O /app/code/mc && chmod +x /app/code/mc
+RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /app/code/mc && chmod +x /app/code/mc
 
-COPY env.sh start.sh /app/code/
+COPY env.sh.template start.sh /app/code/
 
 CMD [ "/app/code/start.sh" ]

POSTINSTALL.md

@@ -1,7 +1,19 @@
+<nosso>
 Please use the following credentials to login:
 
 **Username**: minioadmin<br/>
 **Password**: minioadmin<br/>
 
 Please change the credentials immediately by following this [guide](https://cloudron.io/documentation/apps/minio/#admin-credentials).
+</nosso>
 
+<sso>
+
+Please use the following credentials to login via 'Other Authentication Methods' -> 'Use Credentials':
+
+**Username**: minioadmin<br/>
+**Password**: See `MINIO_ROOT_PASSWORD` in `/app/data/env.sh` <a href="/frontend/filemanager.html#/viewer/app/$CLOUDRON-APP-ID/env.sh">Open File Manager</a><br/>
+
+Cloudron users have `readwrite` access policy. See the [docs](https://cloudron.io/documentation/apps/minio/#admin-credentials) on how to change it.
+
+</nosso>

README.md

@@ -37,3 +37,8 @@ PATH=$PATH:node_modules/.bin mocha --bail test.js
 ## Notes
 
 MinIO Console is an embedded web-based object browser built into MinIO Server
+
+## Multi-domain
+
+MINIO_DOMAIN=domain.com env var can be set to server DNS style requests as bucket.domain.com . This requires the platform code to set aliases for the httpPorts and not the primaryport.
+

env.sh

@@ -1,9 +0,0 @@
-# Add custom minio configuration to this file. Restart the app for changes to take effect.
-
-export CLOUDRON_MINIO_STARTUP_ARGS='server /app/data/data'
-
-# See https://docs.min.io/minio/baremetal/reference/minio-server/minio-server.html#envvar.MINIO_ROOT_USER
-# You can use pwgen -1s 64 to generate usernames and passwords
-export MINIO_ROOT_USER=minioadmin
-export MINIO_ROOT_PASSWORD=minioadmin
-

env.sh.template

@@ -0,0 +1,4 @@
+# Add custom minio configuration to this file. Restart the app for changes to take effect.
+
+export CLOUDRON_MINIO_STARTUP_ARGS='server /app/data/data'
+

start.sh

@@ -4,7 +4,19 @@ set -eu
 
 mkdir -p /app/data/data /run/minio/config /run/minio/certs
 
-[[ ! -f /app/data/env.sh ]] && cp /app/code/env.sh /app/data/env.sh
+# env vars take precedence over config.yaml (https://github.com/minio/minio/blob/master/docs/distributed/CONFIG.md#things-to-know)
+if [[ ! -f /app/data/env.sh ]]; then
+    echo "=> First run"
+    cp /app/code/env.sh.template /app/data/env.sh
+    # minio does not show the password login by default when OIDC is setup (https://github.com/minio/minio/discussions/16928)
+    # we generate a dynamic password because users might forget to change the admin password (with the oidc login being so click friendly)
+    if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
+        echo -e "export MINIO_ROOT_USER=minioadmin\nexport MINIO_ROOT_PASSWORD=$(pwgen -1s 20)\n\n" >> /app/data/env.sh
+    else
+        echo -e "export MINIO_ROOT_USER=minioadmin\nexport MINIO_ROOT_PASSWORD=minioadmin\n\n" >> /app/data/env.sh
+    fi
+fi
+
 source /app/data/env.sh
 
 # https://docs.min.io/minio/baremetal/reference/minio-server/minio-server.html#envvar.MINIO_SERVER_URL
@@ -16,11 +28,23 @@ if [[ ! -d /app/data/mc_config ]]; then
     /app/code/mc --config-dir /app/data/mc_config &> /dev/null || true
 fi
 
+if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
+    export MINIO_IDENTITY_OPENID_DISPLAY_NAME="Cloudron"
+    export MINIO_IDENTITY_OPENID_CONFIG_URL="${CLOUDRON_OIDC_DISCOVERY_URL}"
+    export MINIO_IDENTITY_OPENID_CLIENT_ID="${CLOUDRON_OIDC_CLIENT_ID}"
+    export MINIO_IDENTITY_OPENID_CLIENT_SECRET="${CLOUDRON_OIDC_CLIENT_SECRET}"
+    export MINIO_IDENTITY_OPENID_SCOPES="openid profile email"
+    if [[ -z "${MINIO_IDENTITY_OPENID_ROLE_POLICY:-}" ]]; then
+        export MINIO_IDENTITY_OPENID_ROLE_POLICY="readwrite"
+    fi
+
+    export MINIO_IDENTITY_OPENID_COMMENT="Cloudron OIDC"
+fi
+
 # minio is used for backups at times and has a large number of files. optimize by checking if files are actually in correct chown state
 echo "==> Changing ownership"
 [[ $(stat --format '%U' /app/data/data) != "cloudron" ]] && chown -R cloudron:cloudron /app/data
 
-# the --config-dir is deprecated and not used. but without it, minio will try to create $HOME/.minio :/ same for --certs-dir
 echo "==> Starting minio"
-exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --certs-dir /run/minio/certs --config-dir /run/minio/config --quiet ${CLOUDRON_MINIO_STARTUP_ARGS} --address :9000 --console-address :8000
+exec /usr/local/bin/gosu cloudron:cloudron /app/code/minio --quiet ${CLOUDRON_MINIO_STARTUP_ARGS} --address :9000 --console-address :8000
 

test/package.json

@@ -9,11 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^104.0.0",
-    "delay": "^5.0.0",
+    "chromedriver": "^124.0.1",
     "expect.js": "^0.3.1",
-    "mocha": "^10.0.0",
-    "selenium-webdriver": "^4.4.0",
-    "superagent": "^8.0.0"
+    "mocha": "^10.4.0",
+    "selenium-webdriver": "^4.20.0",
+    "superagent": "^9.0.2"
   }
 }

test/test.js

@@ -11,24 +11,32 @@
 
 require('chromedriver');
 
-const delay = require('delay'),
-    execSync = require('child_process').execSync,
+const execSync = require('child_process').execSync,
     expect = require('expect.js'),
     fs = require('fs'),
     path = require('path'),
     superagent = require('superagent'),
+    timers = require('timers/promises'),
     { Builder, By, until } = require('selenium-webdriver'),
     { Options } = require('selenium-webdriver/chrome');
 
+if (!process.env.USERNAME || !process.env.PASSWORD) {
+    console.log('USERNAME and PASSWORD env vars need to be set');
+    process.exit(1);
+}
+
 describe('Application life cycle test', function () {
     this.timeout(0);
 
     const LOCATION = 'test';
-    const TEST_TIMEOUT = 30000;
+    const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 30000;
     const BUCKET = 'cloudrontestbucket';
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
     let browser, app;
+    let athenticated_by_oidc = false, rootPassword;
+    let username = process.env.USERNAME;
+    let password = process.env.PASSWORD;
 
     before(function () {
         browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
@@ -49,32 +57,69 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     }
 
-    async function login(accessKey='minioadmin', secretKey='minioadmin') {
+    async function login(username, password, expandLoginForm=true) {
+        await browser.manage().deleteAllCookies();
+        await browser.get('about:blank');
+        await browser.sleep(2000);
         await browser.get(`https://${app.fqdn}/login`);
+        await browser.sleep(2000);
+
+        if (expandLoginForm) {
+            await waitForElement(By.xpath('//div[@id="alternativeMethods-select"]/div[contains(., "Other Authentication Methods")]'));
+            await browser.findElement(By.xpath('//div[@id="alternativeMethods-select"]/div[contains(., "Other Authentication Methods")]')).click();
+            await browser.sleep(2000);
+            await browser.findElement(By.xpath('//li[contains(., "Use Credentials")] | //div[@label="Use Credentials"]')).click();
+            await browser.sleep(2000);
+        }
         await waitForElement(By.id('accessKey'));
-        await browser.findElement(By.id('accessKey')).sendKeys(accessKey);
-        await browser.findElement(By.id('secretKey')).sendKeys(secretKey);
-        await browser.findElement(By.xpath('//button[contains(text(), "Login")]')).click();
+        await browser.findElement(By.id('accessKey')).sendKeys(username);
+        await browser.findElement(By.id('secretKey')).sendKeys(password);
+        await browser.findElement(By.xpath('//button[@id="do-login"]')).click();
+        await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
+        await timers.setTimeout(5000);
+    }
+
+    async function loginOIDC(username, password) {
+        browser.manage().deleteAllCookies();
+        await browser.get(`https://${app.fqdn}/login`);
+        await browser.sleep(10000);
+
+        await browser.findElement(By.xpath('//button[contains(., "Cloudron")]')).click();
+        await browser.sleep(10000);
+
+        if (!athenticated_by_oidc) {
+            await waitForElement(By.xpath('//input[@name="username"]'));
+            await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
+            await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
+            await browser.sleep(2000);
+            await browser.findElement(By.id('loginSubmitButton')).click();
+            await browser.sleep(2000);
+
+            athenticated_by_oidc = true;
+        }
+
         await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
-        await delay(5000);
     }
 
     async function logout() {
         await browser.get(`https://${app.fqdn}/`);
         await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
-        await browser.findElement(By.xpath('//div/span[contains(text(), "Logout")]')).click();
-        await waitForElement(By.id('accessKey'));
+        const button = await browser.findElement(By.xpath('//button[@id="sign-out"]'));
+        await browser.executeScript('arguments[0].scrollIntoView(false)', button);
+        await button.click();
+        await browser.sleep(10000); // needed!
+        await waitForElement(By.xpath('//*[@id="accessKey"] | //button[contains(., "Cloudron")]'));
     }
 
     async function addBucket() {
         await browser.get(`https://${app.fqdn}/buckets`);
-        await waitForElement(By.xpath('//button/span[text()="Create Bucket"]'));
-        await browser.findElement(By.xpath('//button/span[text()="Create Bucket"]')).click();
+        await waitForElement(By.xpath('//button[@id="create-bucket"]'));
+        await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
         await browser.sleep(2000);
         await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET);
-        await browser.findElement(By.xpath('//button[text()="Create Bucket"]')).click();
-        await waitForElement(By.xpath(`//a[contains(text(), "${BUCKET}")]`));
-        await delay(5000);
+        await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
+        await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
+        await timers.setTimeout(5000);
     }
 
     async function checkBucket() {
@@ -94,38 +139,87 @@ describe('Application life cycle test', function () {
         expect(response.body.toString('utf8')).to.contain('<Code>AccessDenied</Code>');
     }
 
+    async function changeAdminCredentials() {
+        let data = fs.readFileSync(path.join(__dirname, '../env.sh.template'), 'utf8');
+        data += '\nexport MINIO_ROOT_USER=minioakey\nexport MINIO_ROOT_PASSWORD=minioskey\n';
+        fs.writeFileSync('/tmp/env.sh', data);
+        execSync(`cloudron push --app ${app.id} /tmp/env.sh /app/data/env.sh`, EXEC_ARGS);
+        execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS);
+        await timers.setTimeout(10000);
+    }
+
+    async function getAdminCredentials() {
+        execSync(`cloudron pull --app ${app.id} /app/data/env.sh /tmp/env.sh`, EXEC_ARGS);
+        const data = fs.readFileSync('/tmp/env.sh', 'utf8');
+        const m = data.match(/MINIO_ROOT_PASSWORD=(.*)/);
+        if (!m) throw new Error('Could not detect root password');
+        rootPassword = m[1].trim();
+        console.log(`root password is [${rootPassword}]`);
+    }
+
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-    it('install app', async function () {
-        execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS);
-        await delay(10000);
+
+    // // no SSO
+    it('install app (no SSO)', async function () {
+        execSync(`cloudron install --no-sso --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS);
+        await timers.setTimeout(10000);
     });
 
     it('can get app information', getAppInfo);
 
-    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can admin login', login.bind(null, 'minioadmin', 'minioadmin', false));
     it('can add bucket', addBucket);
     it('can logout', logout);
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
-    it('can change credentials', async function () {
-        let data = fs.readFileSync(path.join(__dirname, '../env.sh'), 'utf8');
-        data = data
-            .replace(/MINIO_ROOT_USER=.*/, 'MINIO_ROOT_USER=minioakey')
-            .replace(/MINIO_ROOT_PASSWORD=.*/, 'MINIO_ROOT_PASSWORD=minioskey');
-        fs.writeFileSync('/tmp/env.sh', data);
-        execSync(`cloudron push --app ${app.id} /tmp/env.sh /app/data/env.sh`, EXEC_ARGS);
+    it('can change admin credentials', changeAdminCredentials);
+    it('can restart app', async function () {
         execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS);
-        await delay(10000);
+        await timers.setTimeout(10000);
     });
 
-    it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
-
-    it('can login', login.bind(null, 'minioakey', 'minioskey'));
+    it('can admin login', login.bind(null, 'minioakey', 'minioskey', false));
     it('has bucket', checkBucket);
     it('can logout', logout);
     it('does redirect', checkRedirect);
     it('check api', checkApi);
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
+
+    // SSO
+    it('install app (SSO)', async function () {
+        execSync(`cloudron install --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS);
+        await timers.setTimeout(10000);
+    });
+
+    it('can get app information', getAppInfo);
+    it('can get admin credentials', getAdminCredentials);
+    it('can admin login', async function () { await login('minioadmin', rootPassword); });
+    it('can add bucket', addBucket);
+    it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
+
+    it('can OIDC login', loginOIDC.bind(null, username, password));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+
+    it('can change admin credentials', changeAdminCredentials);
+
+    it('can restart app', async function () {
+        execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS);
+        await timers.setTimeout(10000);
+    });
+
+    it('can admin login', login.bind(null, 'minioakey', 'minioskey'));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+    it('does redirect', checkRedirect);
+    it('check api', checkApi);
+
+    it('can OIDC login', loginOIDC.bind(null, username, password));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
 
     it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
     it('restore app', async function () {
@@ -134,44 +228,66 @@ describe('Application life cycle test', function () {
         execSync('cloudron install --location ' + LOCATION, EXEC_ARGS);
         getAppInfo();
         execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
-        await delay(10000);
+        await timers.setTimeout(10000);
     });
 
-    it('can login', login.bind(null, 'minioakey', 'minioskey'));
+    it('can get app information', getAppInfo);
+    it('can admin login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
     it('can logout', logout);
+
+    it('can OIDC login', loginOIDC.bind(null, username, password));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
     it('move to different location', async function () {
         browser.manage().deleteAllCookies();
         execSync('cloudron configure --location ' + LOCATION + '2', EXEC_ARGS);
-        await delay(10000);
+        await timers.setTimeout(10000);
     });
     it('can get app information', getAppInfo);
 
-    it('can login', login.bind(null, 'minioakey', 'minioskey'));
+    it('can admin login', login.bind(null, 'minioakey', 'minioskey'));
     it('has bucket', checkBucket);
     it('can logout', logout);
+
+    it('can OIDC login', loginOIDC.bind(null, username, password));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
     it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 
     // test update
-    it('can install app', function () { execSync('cloudron install --appstore-id io.minio.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
+    it('can install app for update', function () { execSync('cloudron install --appstore-id io.minio.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
-    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can get admin credentials', getAdminCredentials);
+    it('can admin login', async function () { await login('minioadmin', rootPassword); });
     it('can add buckets', addBucket);
     it('can logout', logout);
+
+    it('can OIDC login', loginOIDC.bind(null, username, password));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+
     it('can update', function () { execSync(`cloudron update --app ${LOCATION}`, EXEC_ARGS); });
     it('can configure', function () { execSync(`cloudron configure --app ${LOCATION} --location ${LOCATION} --secondary-domains API_SERVER_DOMAIN=${LOCATION}-api`, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
-    it('can login', login.bind(null, 'minioadmin', 'minioadmin'));
+    it('can admin login', async function () { await login('minioadmin', rootPassword); });
     it('has bucket', checkBucket);
     it('can logout', logout);
+
+    it('can OIDC login', loginOIDC.bind(null, username, password));
+    it('has bucket', checkBucket);
+    it('can logout', logout);
+
     it('does redirect', checkRedirect);
     it('check api', checkApi);