Merge pull request #3755 from micbar/fix-lang-app-open

change language code validation
cs3org · Mar 28, 2023 · 9bafcee · 9bafcee
2 parents 36c2ef9 + b267842
commit 9bafcee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-app-provider-lang.md b/changelog/unreleased/fix-app-provider-lang.md
@@ -0,0 +1,6 @@
+Bugfix: Fix app provider language validation
+
+This changes the validation to only look at the first part (tag) of the language code and ignore the second part (sub-tag).
+
+
+https://github.com/cs3org/reva/pull/3755
diff --git a/internal/http/services/appprovider/appprovider.go b/internal/http/services/appprovider/appprovider.go
@@ -366,8 +366,9 @@ func (s *svc) handleOpen(openMode int) http.HandlerFunc {
 		}
 
 		lang := r.Form.Get("lang")
-		if lang != "" && !iso6391.ValidCode(lang) {
-			writeError(w, r, appErrorInvalidParameter, "lang parameter does not contain a valid ISO 639-1 language code", nil)
+		parts := strings.Split(lang, "_")
+		if lang != "" && !iso6391.ValidCode(parts[0]) {
+			writeError(w, r, appErrorInvalidParameter, "lang parameter does not contain a valid ISO 639-1 language code in the language tag", nil)
 			return
 		}