Update package version to 1.38.1

| datasource      | package        | from   | to     |
| --------------- | -------------- | ------ | ------ |
| github-releases | go-gitea/gitea | 1.26.0 | 1.26.1 |

.gitignore

@@ -1,2 +1,4 @@
 node_modules/
 
+test/test-results.xml
+test/screenshots/

CHANGELOG.md

@@ -1840,3 +1840,171 @@
 * Start automerge check again after the conflict check and the schedule ([#​34988](https://github.com/go-gitea/gitea/issues/34988)) ([#​35002](https://github.com/go-gitea/gitea/issues/35002))
 * Fix the response format for actions/workflows ([#​35009](https://github.com/go-gitea/gitea/issues/35009)) ([#​35016](https://github.com/go-gitea/gitea/issues/35016))
 
+[1.36.5]
+* Update gitea to 1.24.4
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.24.4)
+* Fix various bugs (1.24) ([#​35186](https://github.com/go-gitea/gitea/issues/35186))
+* Fix migrate input box bug ([#​35166](https://github.com/go-gitea/gitea/issues/35166)) ([#​35171](https://github.com/go-gitea/gitea/issues/35171))
+* Only hide dropzone when no files have been uploaded ([#​35156](https://github.com/go-gitea/gitea/issues/35156)) ([#​35167](https://github.com/go-gitea/gitea/issues/35167))
+* Fix review comment/dimiss comment x reference can be refereced back ([#​35094](https://github.com/go-gitea/gitea/issues/35094)) ([#​35099](https://github.com/go-gitea/gitea/issues/35099))
+* Fix submodule nil check ([#​35096](https://github.com/go-gitea/gitea/issues/35096)) ([#​35098](https://github.com/go-gitea/gitea/issues/35098))
+* Don't use full-file highlight when there is a git diff textconv ([#​35114](https://github.com/go-gitea/gitea/issues/35114)) ([#​35119](https://github.com/go-gitea/gitea/issues/35119))
+* Increase gap on latest commit ([#​35104](https://github.com/go-gitea/gitea/issues/35104)) ([#​35113](https://github.com/go-gitea/gitea/issues/35113))
+
+[1.36.6]
+* Update gitea to 1.24.5
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.24.5)
+* Fix a bug where lfs gc never worked. (#35198) (#35255)
+* Reload issue when sending webhook to make num comments is right. (#35243) (#35248)
+* Fix bug when review pull request commits (#35192) (#35246)
+
+[1.36.7]
+* Update gitea to 1.24.6
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.24.6)
+* Upgrade xz to v0.5.15 ([#35385](https://github.com/go-gitea/gitea/issues/35385))
+* Fix a compare page 404 bug when the pull request disabled ([#35441](https://github.com/go-gitea/gitea/issues/35441)) ([#35453](https://github.com/go-gitea/gitea/issues/35453))
+* Fix bug when issue disabled, pull request number in the commit message cannot be redirected ([#35420](https://github.com/go-gitea/gitea/issues/35420)) ([#35442](https://github.com/go-gitea/gitea/issues/35442))
+* Add author.name field to Swift Package Registry API response ([#35410](https://github.com/go-gitea/gitea/issues/35410)) ([#35431](https://github.com/go-gitea/gitea/issues/35431))
+* Remove usernames when empty in discord webhook ([#35412](https://github.com/go-gitea/gitea/issues/35412)) ([#35417](https://github.com/go-gitea/gitea/issues/35417))
+* Allow foreachref parser to grow its buffer ([#35365](https://github.com/go-gitea/gitea/issues/35365)) ([#35376](https://github.com/go-gitea/gitea/issues/35376))
+* Allow deleting comment with content via API like web did ([#35346](https://github.com/go-gitea/gitea/issues/35346)) ([#35354](https://github.com/go-gitea/gitea/issues/35354))
+* Fix atom/rss mixed error ([#35345](https://github.com/go-gitea/gitea/issues/35345)) ([#35347](https://github.com/go-gitea/gitea/issues/35347))
+* Fix review request webhook bug ([#35339](https://github.com/go-gitea/gitea/issues/35339))
+* Remove duplicate html IDs ([#35210](https://github.com/go-gitea/gitea/issues/35210)) ([#35325](https://github.com/go-gitea/gitea/issues/35325))
+
+[1.36.8]
+* Update gitea to 1.24.7
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.24.7)
+* Refactor legacy code ([#​35708](https://github.com/go-gitea/gitea/issues/35708)) ([#​35713](https://github.com/go-gitea/gitea/issues/35713))
+* Fixing issue [#​35530](https://github.com/go-gitea/gitea/issues/35530): Password Leak in Log Messages ([#​35584](https://github.com/go-gitea/gitea/issues/35584)) ([#​35665](https://github.com/go-gitea/gitea/issues/35665))
+* Fix a bug missed return ([#​35655](https://github.com/go-gitea/gitea/issues/35655)) ([#​35671](https://github.com/go-gitea/gitea/issues/35671))
+* Fix inputing review comment will remove reviewer ([#​35591](https://github.com/go-gitea/gitea/issues/35591)) ([#​35664](https://github.com/go-gitea/gitea/issues/35664))
+* Mock external service in hcaptcha TestCaptcha ([#​35604](https://github.com/go-gitea/gitea/issues/35604)) ([#​35663](https://github.com/go-gitea/gitea/issues/35663))
+* Fix build ([#​35669](https://github.com/go-gitea/gitea/issues/35669))
+
+[1.37.0]
+* Update gitea to 1.25.0
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.0)
+* Return 201 Created for CreateVariable API responses ([#​34517](https://github.com/go-gitea/gitea/issues/34517))
+* Add label 'state' to metric 'gitea\_users' ([#​34326](https://github.com/go-gitea/gitea/issues/34326))
+* Upgrade security public key ([#​34956](https://github.com/go-gitea/gitea/issues/34956))
+* Also include all security fixes in 1.24.x after 1.25.0-rc0
+* Stream repo zip/tar.gz/bundle achives by default ([#​35487](https://github.com/go-gitea/gitea/issues/35487))
+* Fix possible panic ([#​34508](https://github.com/go-gitea/gitea/issues/34508))
+* Fix autofocus behavior ([#​34397](https://github.com/go-gitea/gitea/issues/34397))
+* Fix Actions API ([#​35204](https://github.com/go-gitea/gitea/issues/35204))
+* Fix ListWorkflowRuns OpenAPI response model. ([#​35026](https://github.com/go-gitea/gitea/issues/35026))
+* Small fix in Merge Requests page ([#​34612](https://github.com/go-gitea/gitea/issues/34612))
+* Fix http auth header parsing ([#​34936](https://github.com/go-gitea/gitea/issues/34936))
+* Fix modal + form abuse ([#​34921](https://github.com/go-gitea/gitea/issues/34921))
+* Fix MR toggle WIP ([#​34920](https://github.com/go-gitea/gitea/issues/34920))
+* Fix log fmt ([#​34810](https://github.com/go-gitea/gitea/issues/34810))
+* Replace stopwatch toggle with explicit start/stop actions ([#​34818](https://github.com/go-gitea/gitea/issues/34818))
+* Fix some package registry problems ([#​34759](https://github.com/go-gitea/gitea/issues/34759))
+* Fix RPM package download routing & missing package version count ([#​34909](https://github.com/go-gitea/gitea/issues/34909))
+* Fix repo search input height ([#​34330](https://github.com/go-gitea/gitea/issues/34330))
+* Fix "The sidebar of the repository file list does not have a fixed height [#​34298](https://github.com/go-gitea/gitea/issues/34298)" ([#​34321](https://github.com/go-gitea/gitea/issues/34321))
+* Fix minor typos in two files #HSFDPMUW ([#​34944](https://github.com/go-gitea/gitea/issues/34944))
+* Fix actions skipped commit status indicator ([#​34507](https://github.com/go-gitea/gitea/issues/34507))
+* Fix job status aggregation logic ([#​35000](https://github.com/go-gitea/gitea/issues/35000))
+* Fix broken OneDev migration caused by various REST API changes in OneDev 7.8.0 and later ([#​35216](https://github.com/go-gitea/gitea/issues/35216))
+* Fix typo in locale\_en-US.ini ([#​35196](https://github.com/go-gitea/gitea/issues/35196))
+
+[1.37.1]
+* Update gitea to 1.25.1
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.1)
+* Make ACME email optional ([#35849](https://github.com/go-gitea/gitea/issues/35849)) [#35857](https://github.com/go-gitea/gitea/issues/35857))
+* Add a doctor command to fix inconsistent run status ([#35840](https://github.com/go-gitea/gitea/issues/35840)) ([#35845](https://github.com/go-gitea/gitea/issues/35845))
+* Remove wrong code ([#35846](https://github.com/go-gitea/gitea/issues/35846))
+* Fix viewed files number is not right if not all files loaded ([#35821](https://github.com/go-gitea/gitea/issues/35821)) ([#35844](https://github.com/go-gitea/gitea/issues/35844))
+* Fix incorrect pull request counter ([#35819](https://github.com/go-gitea/gitea/issues/35819)) ([#35841](https://github.com/go-gitea/gitea/issues/35841))
+* Upgrade go mail to 0.7.2 and fix the bug ([#35833](https://github.com/go-gitea/gitea/issues/35833)) ([#35837](https://github.com/go-gitea/gitea/issues/35837))
+* Revert gomail to v0.7.0 to fix sending mail failed ([#35816](https://github.com/go-gitea/gitea/issues/35816)) ([#35824](https://github.com/go-gitea/gitea/issues/35824))
+* Fix clone mixed bug ([#35810](https://github.com/go-gitea/gitea/issues/35810)) ([#35822](https://github.com/go-gitea/gitea/issues/35822))
+* Fix cli "Before" handling ([#35797](https://github.com/go-gitea/gitea/issues/35797)) ([#35808](https://github.com/go-gitea/gitea/issues/35808))
+* Improve and fix markup code preview rendering ([#35777](https://github.com/go-gitea/gitea/issues/35777)) ([#35787](https://github.com/go-gitea/gitea/issues/35787))
+
+[1.37.2]
+* Update gitea to 1.25.2
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.2)
+* Upgrade golang.org/x/crypto to 0.45.0 ([#35985](https://github.com/go-gitea/gitea/issues/35985)) ([#35988](https://github.com/go-gitea/gitea/issues/35988))
+* Fix various permission & login related bugs ([#36002](https://github.com/go-gitea/gitea/issues/36002)) ([#36004](https://github.com/go-gitea/gitea/issues/36004))
+* Display source code downloads last for release attachments ([#35897](https://github.com/go-gitea/gitea/issues/35897)) ([#35903](https://github.com/go-gitea/gitea/issues/35903))
+* Change project default column icon to 'star' ([#35967](https://github.com/go-gitea/gitea/issues/35967)) ([#35979](https://github.com/go-gitea/gitea/issues/35979))
+* Allow empty commit when merging pull request with squash style ([#35989](https://github.com/go-gitea/gitea/issues/35989)) ([#36003](https://github.com/go-gitea/gitea/issues/36003))
+* Fix container push tag overwriting ([#35936](https://github.com/go-gitea/gitea/issues/35936)) ([#35954](https://github.com/go-gitea/gitea/issues/35954))
+* Fix corrupted external render content ([#35946](https://github.com/go-gitea/gitea/issues/35946)) and upgrade golang.org/x packages ([#35950](https://github.com/go-gitea/gitea/issues/35950))
+* Limit reading bytes instead of ReadAll ([#35928](https://github.com/go-gitea/gitea/issues/35928)) ([#35934](https://github.com/go-gitea/gitea/issues/35934))
+* Use correct form field for allowed force push users in branch protection API ([#35894](https://github.com/go-gitea/gitea/issues/35894)) ([#35908](https://github.com/go-gitea/gitea/issues/35908))
+* Fix team member access check ([#35899](https://github.com/go-gitea/gitea/issues/35899)) ([#35905](https://github.com/go-gitea/gitea/issues/35905))
+
+[1.37.3]
+* Update gitea to 1.25.3
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.3)
+* SECURITY Bump toolchain to go1.25.5, misc fixes ([#​36082](https://github.com/go-gitea/gitea/issues/36082))
+* ENHANCEMENTS Add strikethrough button to markdown editor ([#​36087](https://github.com/go-gitea/gitea/issues/36087)) ([#​36104](https://github.com/go-gitea/gitea/issues/36104))
+* ENHANCEMENTS Add "site admin" back to profile menu ([#​36010](https://github.com/go-gitea/gitea/issues/36010)) ([#​36013](https://github.com/go-gitea/gitea/issues/36013))
+* ENHANCEMENTS Improve math rendering ([#​36124](https://github.com/go-gitea/gitea/issues/36124)) ([#​36125](https://github.com/go-gitea/gitea/issues/36125))
+* BUGFIXES Check user visibility when redirecting to a renamed user ([#​36148](https://github.com/go-gitea/gitea/issues/36148)) ([#​36159](https://github.com/go-gitea/gitea/issues/36159))
+* BUGFIXES Fix various bugs ([#​36139](https://github.com/go-gitea/gitea/issues/36139)) ([#​36151](https://github.com/go-gitea/gitea/issues/36151))
+* BUGFIXES Fix bug when viewing the commit diff page with non-ANSI files ([#​36149](https://github.com/go-gitea/gitea/issues/36149)) ([#​36150](https://github.com/go-gitea/gitea/issues/36150))
+* BUGFIXES Hide RSS icon when viewing a file not under a branch ([#​36135](https://github.com/go-gitea/gitea/issues/36135)) ([#​36141](https://github.com/go-gitea/gitea/issues/36141))
+* BUGFIXES Fix SVG size calulation, only use `style` attribute ([#​36133](https://github.com/go-gitea/gitea/issues/36133)) ([#​36134](https://github.com/go-gitea/gitea/issues/36134))
+* BUGFIXES Make Golang correctly delete temp files during uploading ([#​36128](https://github.com/go-gitea/gitea/issues/36128)) ([#​36129](https://github.com/go-gitea/gitea/issues/36129))
+
+[1.37.4]
+* Update gitea to 1.25.4
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.4)
+* Release attachments must belong to the intended repo ([#36347](https://github.com/go-gitea/gitea/issues/36347)) ([#36375](https://github.com/go-gitea/gitea/issues/36375))
+* Fix permission check on org project operations ([#36318](https://github.com/go-gitea/gitea/issues/36318)) ([#36373](https://github.com/go-gitea/gitea/issues/36373))
+* Clean watches when make a repository private and check permission when send release emails ([#36319](https://github.com/go-gitea/gitea/issues/36319)) ([#36370](https://github.com/go-gitea/gitea/issues/36370))
+* Add more check for stopwatch read or list ([#36340](https://github.com/go-gitea/gitea/issues/36340)) ([#36368](https://github.com/go-gitea/gitea/issues/36368))
+* Fix openid setting check ([#36346](https://github.com/go-gitea/gitea/issues/36346)) ([#36361](https://github.com/go-gitea/gitea/issues/36361))
+* Fix cancel auto merge bug ([#36341](https://github.com/go-gitea/gitea/issues/36341)) ([#36356](https://github.com/go-gitea/gitea/issues/36356))
+* Fix delete attachment check ([#36320](https://github.com/go-gitea/gitea/issues/36320)) ([#36355](https://github.com/go-gitea/gitea/issues/36355))
+* LFS locks must belong to the intended repo ([#36344](https://github.com/go-gitea/gitea/issues/36344)) ([#36349](https://github.com/go-gitea/gitea/issues/36349))
+* Fix bug on notification read ([#36339](https://github.com/go-gitea/gitea/issues/36339)) [#36387](https://github.com/go-gitea/gitea/issues/36387)
+* Add more routes to the "expensive" list ([#36290](https://github.com/go-gitea/gitea/issues/36290))
+
+[1.37.5]
+* Update gitea to 1.25.5
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.25.5)
+* Make `security-check` informational only
+* Upgrade to github.com/cloudflare/circl 1.6.3, svgo 4.0.1, markdownlint-cli 0.48.0
+* Add some validation on values provided to USER_DISABLED_FEATURES and EXTERNAL_USER_DISABLED_FEATURES
+* Upgrade gogit to 5.16.5
+* Add wrap to runner label list
+* Add dnf5 command for Fedora in RPM package instructions
+* Allow scroll propagation outside code editor
+* Fix non-admins unable to automerge MRs from forks
+* Fix bug when pushing mirror with wiki
+* Fix artifacts v4 backend upload problems
+
+[1.38.0]
+* Update gitea to 1.26.0
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.26.0)
+* Correct swagger annotations for enums, status codes, and notification state ([#37030](https://github.com/go-gitea/gitea/issues/37030))
+* Remove GET API registration-token ([#36801](https://github.com/go-gitea/gitea/issues/36801))
+* Support Actions `concurrency` syntax ([#32751](https://github.com/go-gitea/gitea/issues/32751))
+* Make PUBLIC_URL_DETECTION default to "auto" ([#36955](https://github.com/go-gitea/gitea/issues/36955))
+* Add terraform state registry ([#36710](https://github.com/go-gitea/gitea/issues/36710))
+* Instance-wide (global) info banner and maintenance mode ([#36571](https://github.com/go-gitea/gitea/issues/36571))
+* Support rendering OpenAPI spec ([#36449](https://github.com/go-gitea/gitea/issues/36449))
+* Add keyboard shortcuts for repository file and code search ([#36416](https://github.com/go-gitea/gitea/issues/36416))
+* Automatic generation of release notes ([#35977](https://github.com/go-gitea/gitea/issues/35977))
+* Add button to re-run failed jobs in Actions ([#36924](https://github.com/go-gitea/gitea/issues/36924))
+
+[1.38.1]
+* Update gitea to 1.26.1
+* [Full Changelog](https://github.com/go-gitea/gitea/releases/tag/v1.26.1)
+* Add event.schedule context for schedule actions task ([#37320](https://github.com/go-gitea/gitea/issues/37320)) ([#37348](https://github.com/go-gitea/gitea/issues/37348))
+* Fix an issue where changing an organization's visibility caused problems when users had forked its repositories. ([#37324](https://github.com/go-gitea/gitea/issues/37324)) ([#37344](https://github.com/go-gitea/gitea/issues/37344))
+* Use modern "git update-index --cacheinfo" syntax to support more file names ([#37338](https://github.com/go-gitea/gitea/issues/37338)) ([#37343](https://github.com/go-gitea/gitea/issues/37343))
+* Fix URL related escaping for oauth2 ([#37334](https://github.com/go-gitea/gitea/issues/37334)) ([#37340](https://github.com/go-gitea/gitea/issues/37340))
+* When the requested arch rpm is missing fall back to noarch ([#37236](https://github.com/go-gitea/gitea/issues/37236)) ([#37339](https://github.com/go-gitea/gitea/issues/37339))
+* Fix actions concurrency groups cross-branch leak ([#37311](https://github.com/go-gitea/gitea/issues/37311)) ([#37331](https://github.com/go-gitea/gitea/issues/37331))
+* Fix bug when accessing user badges ([#37321](https://github.com/go-gitea/gitea/issues/37321)) ([#37329](https://github.com/go-gitea/gitea/issues/37329))
+* Fix container auth for public instance ([#37290](https://github.com/go-gitea/gitea/issues/37290)) ([#37294](https://github.com/go-gitea/gitea/issues/37294))
+* Fix Mermaid diagrams failing when node labels contain line breaks ([#37296](https://github.com/go-gitea/gitea/issues/37296)) ([#37299](https://github.com/go-gitea/gitea/issues/37299))
+* Fix: dump with default zip type produces uncompressed zip ([#37401](https://github.com/go-gitea/gitea/issues/37401)) [#37402](https://github.com/go-gitea/gitea/issues/37402)
+

CloudronManifest.json

@@ -4,8 +4,8 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.36.4",
+  "version": "1.38.1",
-  "upstreamVersion": "1.24.1",
+  "upstreamVersion": "1.26.1",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
@@ -23,7 +23,8 @@
     "SSH_PORT": {
       "title": "SSH Port",
       "description": "SSH Port over which repos can be pushed & pulled",
-      "defaultValue": 29418
+      "defaultValue": 29418,
+      "enabledByDefault": true
     }
   },
   "manifestVersion": 2,
@@ -58,7 +59,7 @@
       "sso": false
     }
   },
-  "minBoxVersion": "8.1.0",
+  "minBoxVersion": "9.0.0",
   "forumUrl": "https://forum.cloudron.io/category/19/gitea",
   "documentationUrl": "https://docs.cloudron.io/packages/gitea/"
 }

Dockerfile

@@ -18,7 +18,7 @@ WORKDIR /home/git
 ENV GNUPGHOME="/app/data/gnupg"
 
 # renovate: datasource=github-releases depName=go-gitea/gitea versioning=semver extractVersion=^v(?<version>.+)$
-ARG GITEA_VERSION=1.24.3
+ARG GITEA_VERSION=1.26.1
 
 RUN mkdir -p /home/git/gitea && \
     curl -L https://github.com/go-gitea/gitea/releases/download/v${GITEA_VERSION}/gitea-${GITEA_VERSION}-linux-amd64 -o /home/git/gitea/gitea \

app.ini.template

@@ -91,8 +91,6 @@ ROOT_PATH = /run/gitea
 ; APP_DATA_PATH/avatars
 AVATAR_UPLOAD_PATH =
 GRAVATAR_SOURCE = gravatar
-DISABLE_GRAVATAR = false
-
 
 [attachment]
 ENABLE = true

start.sh

@@ -15,17 +15,6 @@ setup_oidc_source() {
         "REPLACE INTO login_source (id, type, name, is_active, cfg, created_unix, updated_unix) VALUES (1,6,'cloudron', 1,'{\"Provider\":\"openidConnect\",\"ClientID\":\"${CLOUDRON_OIDC_CLIENT_ID}\",\"ClientSecret\":\"${CLOUDRON_OIDC_CLIENT_SECRET}\",\"OpenIDConnectAutoDiscoveryURL\":\"${CLOUDRON_OIDC_ISSUER}/.well-known/openid-configuration\",\"CustomURLMapping\":null,\"IconURL\":\"\",\"Scopes\":[\"openid email profile\"],\"RequiredClaimName\":\"\",\"RequiredClaimValue\":\"\",\"GroupClaimName\":\"\",\"AdminGroup\":\"\",\"GroupTeamMap\":\"\",\"GroupTeamMapRemoval\":false,\"RestrictedGroup\":\"\"}','${now}','${now}')"
 }
 
-setup_root_user() {
-    set -eu
-
-    if sudo -H -u git /home/git/gitea/gitea admin user create --username root --password changeme --email admin@cloudron.local --admin -c /run/gitea/app.ini; then
-        echo "==> root user added"
-    else
-        echo "==> Failed to add root user"
-        exit 1
-    fi
-}
-
 setup_auth() {
     set -eu
 
@@ -45,7 +34,12 @@ setup_auth() {
     # be careful, not to create root user for existing LDAP based installs
     if [[ "${user_count}" == "0" ]]; then
         echo "==> Setting up root user for first run"
-        setup_root_user
+        if sudo -H -u git /home/git/gitea/gitea admin user create --username root --password changeme --email admin@cloudron.local --admin -c /run/gitea/app.ini; then
+            echo "==> root user added"
+        else
+            echo "==> Failed to add root user"
+            exit 1
+        fi
     fi
 }
 
@@ -124,7 +118,12 @@ echo "==> Creating dirs and changing permissions"
 mkdir -p /app/data/repository /app/data/ssh /app/data/custom /app/data/gnupg
 chown -R git:git /app/data /run/gitea
 
-# this expects app.ini to be available
+# OIDC creds are read from the db at gitea startup, so if migrations have already
+# run (i.e. the user table exists), refresh the OIDC source synchronously now.
+if mysql -u"${CLOUDRON_MYSQL_USERNAME}" -p"${CLOUDRON_MYSQL_PASSWORD}" -h"${CLOUDRON_MYSQL_HOST}" -P"${CLOUDRON_MYSQL_PORT}" --database="${CLOUDRON_MYSQL_DATABASE}" -N -B -e "SELECT count(*) FROM user" >/dev/null 2>&1; then
+    [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]] && setup_oidc_source
+else
     ( setup_auth ) &
+fi
 
 exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i Gitea

test/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "test.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "chromedriver": "^138.0.2",
-    "expect.js": "^0.3.1",
-    "mocha": "^11.7.1",
-    "selenium-webdriver": "^4.34.0",
-    "superagent": "^10.2.2"
-  }
-}

test/test.js

@@ -1,216 +1,116 @@
 #!/usr/bin/env node
 
-/* jshint esversion: 8 */
+import assert from 'node:assert/strict';
-/* global it, xit, describe, before, after, afterEach */
+import { execSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import {
+    app,
+    clearCache,
+    click,
+    cloudronCli,
+    goto,
+    loginOIDC,
+    sendKeys,
+    setupBrowser,
+    takeScreenshot,
+    teardownBrowser,
+    username,
+    waitFor,
+    waitForUrl,
+    press
+} from '@cloudron/charlie';
 
-'use strict';
+/* global it, describe, before, after, afterEach */
 
-require('chromedriver');
-
-const execSync = require('child_process').execSync,
-    expect = require('expect.js'),
-    fs = require('fs'),
-    path = require('path'),
-    superagent = require('superagent'),
-    { Builder, By, until } = require('selenium-webdriver'),
-    { Options } = require('selenium-webdriver/chrome');
-
-if (!process.env.USERNAME || !process.env.PASSWORD || !process.env.EMAIL) {
-    console.log('USERNAME, PASSWORD and EMAIL env vars need to be set');
-    process.exit(1);
-}
-
-describe('Application life cycle test', function () {
-    this.timeout(0);
-
-    const TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 5000;
-    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
-    const LOCATION = process.env.LOCATION || 'test';
 const SSH_PORT = 29420;
-
+const INSTALL_TCP_FLAGS = { SSH_PORT };
-    let app, browser;
-
 const repodir = '/tmp/testrepo';
 const reponame = 'testrepo';
 
-    const username = process.env.USERNAME;
+describe('Application life cycle test', function () {
-    const password = process.env.PASSWORD;
+    before(setupBrowser);
-
+    after(async function () {
-    before(function () {
+        await teardownBrowser();
-        const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
-        if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
-        browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
-        if (!fs.existsSync('./screenshots')) fs.mkdirSync('./screenshots');
-    });
-
-    after(function () {
-        browser.quit();
         fs.rmSync(repodir, { recursive: true, force: true });
     });
 
     afterEach(async function () {
-        if (!process.env.CI || !app) return;
+        await takeScreenshot(this.currentTest.title);
-
-        const currentUrl = await browser.getCurrentUrl();
-        if (!currentUrl.includes(app.domain)) return;
-        expect(this.currentTest.title).to.be.a('string');
-
-        const screenshotData = await browser.takeScreenshot();
-        fs.writeFileSync(`./screenshots/${new Date().getTime()}-${this.currentTest.title.replaceAll(' ', '_')}.png`, screenshotData, 'base64');
     });
 
-    function getAppInfo() {
+    async function login(user, passwd) {
-        const inspect = JSON.parse(execSync('cloudron inspect'));
+        await goto(`https://${app.fqdn}/user/login`, 'label=Username or Email Address');
-        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
+        await sendKeys('label=Username or Email Address', user);
-        expect(app).to.be.an('object');
+        await sendKeys('label=Password', passwd);
-    }
+        await click('Sign In', { role: 'button' }); // there is a sign in link at the top
-
+        await waitFor('Milestones');
-    async function waitForElement(elem) {
-        await browser.wait(until.elementLocated(elem), TIMEOUT);
-        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TIMEOUT);
-    }
-
-    function sleep(millis) {
-        return new Promise(resolve => setTimeout(resolve, millis));
-    }
-
-    async function setAvatar() {
-        await browser.get('https://' + app.fqdn + '/user/settings');
-
-        var button = await browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]'));
-        await browser.executeScript('arguments[0].scrollIntoView(false)', button);
-        await browser.findElement(By.xpath('//label[contains(text(), "Use Custom Avatar")]')).click();
-        await browser.findElement(By.xpath('//input[@type="file" and @name="avatar"]')).sendKeys(path.resolve(__dirname, '../logo.png'));
-        await browser.findElement(By.xpath('//button[contains(text(), "Update Avatar")]')).click();
-        await browser.wait(until.elementLocated(By.xpath('//p[contains(text(),"Your avatar has been updated.")]')), TIMEOUT);
-    }
-
-    async function checkAvatar() {
-        await browser.get(`https://${app.fqdn}/${username}`);
-
-        const avatarSrc = await browser.findElement(By.xpath('//div[@id="profile-avatar"]/a/img')).getAttribute('src');
-
-        const response = await superagent.get(avatarSrc);
-        expect(response.statusCode).to.equal(200);
-    }
-
-    async function login(username, password) {
-        await browser.get('https://' + app.fqdn + '/user/login');
-
-        await browser.findElement(By.id('user_name')).sendKeys(username);
-        await browser.findElement(By.id('password')).sendKeys(password);
-        await browser.findElement(By.xpath('//form[@action="/user/login"]//button')).click();
-        await browser.wait(until.elementLocated(By.xpath('//img[contains(@class, "avatar")]')), TIMEOUT);
     }
 
     async function adminLogin() {
         await login('root', 'changeme');
     }
 
-    async function loginOIDC(username, password, alreadyAuthenticated = true) {
+    async function loginGiteaOIDC() {
-        browser.manage().deleteAllCookies();
+        await clearCache();
-        await browser.get(`https://${app.fqdn}/user/login`);
+        await goto(`https://${app.fqdn}/user/login`, /Sign in with/);
-        await browser.sleep(2000);
+        await click(/Sign in with/);
-
+        await loginOIDC('Milestones');
-
-        await browser.findElement(By.xpath('//a[contains(@class, "openidConnect") and contains(., "Sign in with cloudron")]')).click();
-        await browser.sleep(2000);
-
-        if (!alreadyAuthenticated) {
-            await waitForElement(By.id('inputUsername'));
-            await browser.findElement(By.id('inputUsername')).sendKeys(username);
-            await browser.findElement(By.id('inputPassword')).sendKeys(password);
-            await browser.sleep(2000);
-            await browser.findElement(By.id('loginSubmitButton')).click();
-            await browser.sleep(2000);
-        }
-
-        await waitForElement(By.xpath('//img[contains(@class, "avatar")]'));
     }
 
     async function logout() {
-        await browser.get('https://' + app.fqdn);
+        await clearCache();
-
-        await browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click();
-        await sleep(2000);
-        await browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click();
-        await sleep(2000);
     }
 
     async function addPublicKey() {
-        const publicKey = fs.readFileSync(__dirname + '/id_ed25519.pub', 'utf8');
+        const keyPath = path.join(import.meta.dirname, 'id_ed25519');
-        execSync(`chmod g-rw,o-rw ${__dirname}/id_ed25519`); // ssh will complain about perms later
+        fs.chmodSync(keyPath, 0o600);
 
-        await browser.get('https://' + app.fqdn + '/user/settings/keys');
+        await goto(`https://${app.fqdn}/user/settings/keys`, 'css=#add-ssh-button');
-
+        await click('css=#add-ssh-button'); // there are two Add key buttons
-        await browser.wait(until.elementLocated(By.id('add-ssh-button')), TIMEOUT);
+        await sendKeys('label=Content', fs.readFileSync(`${import.meta.dirname}/id_ed25519.pub`, 'utf8').trim()); // there are two Content labels
-        await browser.findElement(By.id('add-ssh-button')).click();
+        await sendKeys('label=Key Name', 'testkey');
-        await browser.findElement(By.id('ssh-key-title')).sendKeys('testkey');
+        await press('label=Key Name', 'Enter');
-        await browser.findElement(By.id('ssh-key-content')).sendKeys(publicKey.trim()); // #3480
+        await waitFor(/has been added/);
-        var button = browser.findElement(By.xpath('//button[contains(text(), "Add Key")]'));
-        await browser.executeScript('arguments[0].scrollIntoView(false)', button);
-        await browser.findElement(By.xpath('//form//button[contains(text(),"Add Key")]')).click();
-
-        await browser.wait(until.elementLocated(By.xpath('//p[contains(text(), "has been added.")]')), TIMEOUT);
     }
 
     async function createRepo() {
-        await browser.get(`https://${app.fqdn}/repo/create`);
+        await goto(`https://${app.fqdn}/repo/create`, 'label=Repository Name');
-        await browser.wait(until.elementLocated(By.id('repo_name')));
+        await sendKeys('label=Repository Name', reponame);
-        await browser.findElement(By.id('repo_name')).sendKeys(reponame);
+        await click(/Initialize Repository/);
-        var button = browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]'));
+        await click('Create Repository');
-        await browser.executeScript('arguments[0].scrollIntoView(true)', button);
+        await waitForUrl(`https://${app.fqdn}/${username}/${reponame}`);
-        await browser.findElement(By.id('auto-init')).click();
-        await browser.findElement(By.xpath('//button[contains(text(), "Create Repository")]')).click();
-
-        await browser.wait(function () {
-            return browser.getCurrentUrl().then(function (url) {
-                return url === 'https://' + app.fqdn + '/' + username + '/' + reponame;
-            });
-        }, TIMEOUT);
     }
 
     function cloneRepo() {
         fs.rmSync(repodir, { recursive: true, force: true });
-        var env = Object.create(process.env);
+        const env = Object.create(process.env);
-        env.GIT_SSH = __dirname + '/git_ssh_wrapper.sh';
+        env.GIT_SSH = path.join(import.meta.dirname, 'git_ssh_wrapper.sh');
-        execSync(`git clone ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git ${repodir}`, { env: env });
+        execSync(`git clone ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame}.git ${repodir}`, { env });
     }
 
     function pushFile() {
         const env = Object.create(process.env);
-        env.GIT_SSH = __dirname + '/git_ssh_wrapper.sh';
+        env.GIT_SSH = path.join(import.meta.dirname, 'git_ssh_wrapper.sh');
-        execSync(`touch newfile && git add newfile && git commit -a -mx && git push ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame} main`,
+        execSync(
-                 { env: env, cwd: repodir });
+            `touch newfile && git add newfile && git commit -a -mx && git push ssh://git@${app.fqdn}:${SSH_PORT}/${username}/${reponame} main`,
+            { env, cwd: repodir }
+        );
         fs.rmSync(repodir, { recursive: true, force: true });
     }
 
     function fileExists() {
-        expect(fs.existsSync(repodir + '/newfile')).to.be(true);
+        assert.strictEqual(fs.existsSync(`${repodir}/newfile`), true);
     }
 
-    async function sendMail() {
+    it('install app', function () {
-        await browser.get(`https://${app.fqdn}/-/admin/config`);
+        cloudronCli.install({ tcpPortFlags: INSTALL_TCP_FLAGS });
-        await browser.sleep(3000);
+    });
-        const button = await browser.findElement(By.xpath('//button[contains(., "Send")]'));
-        await browser.executeScript('arguments[0].scrollIntoView(true)', button);
-        await browser.findElement(By.xpath('//input[@name="email"]')).sendKeys('test@cloudron.io');
-        await browser.findElement(By.xpath('//button[contains(., "Send")]')).click();
-        await browser.wait(until.elementLocated(By.xpath('//p[contains(., "A testing email has been sent")]')), TIMEOUT);
-    }
-
-    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-    it('install app', function () { execSync(`cloudron install --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
-
-    it('can get app information', getAppInfo);
 
     it('can admin login', adminLogin);
-    it('can send mail', sendMail);
     it('can logout', logout);
 
-    it('can login', loginOIDC.bind(null, username, password, false));
+    it('can login', loginGiteaOIDC);
-    it('can set avatar', setAvatar);
-    it('can get avatar', checkAvatar);
 
     it('can add public key', addPublicKey);
 
@@ -220,79 +120,57 @@ describe('Application life cycle test', function () {
 
     it('can add and push a file', pushFile);
 
-    it('can restart app', function () { execSync('cloudron restart  --app ' + app.id); });
+    it('can restart app', cloudronCli.restart);
 
-    xit('can login', loginOIDC.bind(null, username, password)); // no need to relogin since session persists
     it('can clone the url', cloneRepo);
     it('file exists in repo', fileExists);
 
-    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
+    it('backup app', cloudronCli.createBackup);
-    it('restore app', function () { execSync('cloudron restore --app ' + app.id, EXEC_ARGS); });
+    it('restore app', cloudronCli.restoreFromLatestBackup);
 
-    it('can login', loginOIDC.bind(null, username, password));
+    it('can login', loginGiteaOIDC);
-    it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
-    it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
+    it('file exists in repo', function () {
-
+        assert.strictEqual(fs.existsSync(`${repodir}/newfile`), true);
-    it('move to different location', async function () {
-        //browser.manage().deleteAllCookies(); // commented because of error "'Network.deleteCookie' wasn't found"
-        // ensure we don't hit NXDOMAIN in the mean time
-        await browser.get('about:blank');
-
-        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
-    });
-    it('can get app information', getAppInfo);
-
-    it('can login', loginOIDC.bind(null, username, password));
-    it('can get avatar', checkAvatar);
-    it('can clone the url', cloneRepo);
-    it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
-
-    it('uninstall app', async function () {
-        // ensure we don't hit NXDOMAIN in the mean time
-        await browser.get('about:blank');
-        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
     });
 
-    // No SSO
+    it('move to different location', cloudronCli.changeLocation);
-    it('install app (no sso)', function () { execSync(`cloudron install --no-sso --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
+
+    it('can login', loginGiteaOIDC);
+    it('can clone the url', cloneRepo);
+    it('file exists in repo', function () {
+        assert.strictEqual(fs.existsSync(`${repodir}/newfile`), true);
+    });
+
+    it('uninstall app', cloudronCli.uninstall);
+
+    it('install app (no sso)', function () {
+        cloudronCli.install({ noSso: true, tcpPortFlags: INSTALL_TCP_FLAGS });
+    });
 
-    it('can get app information', getAppInfo);
     it('can admin login (no sso)', adminLogin);
     it('can logout', logout);
 
-    it('uninstall app (no sso)', async function () {
+    it('uninstall app (no sso)', cloudronCli.uninstall);
-        await browser.get('about:blank');
+
-        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+    it('can install app from appstore', async function () {
+        await cloudronCli.appstoreInstall({ tcpPortFlags: INSTALL_TCP_FLAGS });
     });
 
-    // test update
+    it('can login', loginGiteaOIDC);
-    it('can install app', function () { execSync(`cloudron install --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, EXEC_ARGS); });
-
-    it('can get app information', getAppInfo);
-    it('can login', loginOIDC.bind(null, username, password));
-    it('can set avatar', setAvatar);
-    it('can get avatar', checkAvatar);
     it('can add public key', addPublicKey);
     it('can create repo', createRepo);
     it('can clone the url', cloneRepo);
     it('can add and push a file', pushFile);
 
-    it('can update', function () { execSync('cloudron update --app ' + app.id, EXEC_ARGS); });
+    it('can update', cloudronCli.update);
-    it('can get app information', getAppInfo);
 
     it('can admin login', adminLogin);
-    it('can send mail', sendMail);
     it('can logout', logout);
 
-    it('can login', loginOIDC.bind(null, username, password));
+    it('can login', loginGiteaOIDC);
-    it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
     it('file exists in cloned repo', fileExists);
 
-    it('uninstall app', async function () {
+    it('uninstall app', cloudronCli.uninstall);
-        // ensure we don't hit NXDOMAIN in the mean time
-        await browser.get('about:blank');
-        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
-    });
 });