From e051e26dadcdb72fa92fefdccffa025b93ef24de Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 10:51:44 +0200 Subject: [PATCH 1/7] :tada: Add czech lang --- frontend/gulpfile.js | 1 + frontend/src/app/util/i18n.cljs | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 1326239c3..92e6f480c 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -49,6 +49,7 @@ function readLocales() { const langs = ["ar", "ca", "de", "el", "en", "eu", "it", "es", "fa", "fr", "he", "nb_NO", "pl", "pt_BR", "ro", "id", "ru", "tr", "zh_CN", "zh_Hant", "hr", "gl", "pt_PT", + "cs", // this happens when file does not matches correct // iso code for the language. ["ja_jp", "jpn_JP"] diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs index 47e9eb88b..d1fbfe120 100644 --- a/frontend/src/app/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -39,6 +39,7 @@ {:label "Türkçe (community)" :value "tr"} {:label "Ελληνική γλώσσα (community)" :value "el"} {:label "Русский (community)" :value "ru"} + {:label "Český jazyk (community)" :value "cs"} {:label "עִבְרִית (community)" :value "he"} {:label "عربي/عربى (community)" :value "ar"} {:label "فارسی (community)" :value "fa"} From 571439871bf5e0b3f9445b9f1b7ea77047a0dbd3 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 10:53:58 +0200 Subject: [PATCH 2/7] :tada: Add faroese lang --- frontend/gulpfile.js | 2 +- frontend/src/app/util/i18n.cljs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 92e6f480c..db48b6c1c 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -49,7 +49,7 @@ function readLocales() { const langs = ["ar", "ca", "de", "el", "en", "eu", "it", "es", "fa", "fr", "he", "nb_NO", "pl", "pt_BR", "ro", "id", "ru", "tr", "zh_CN", "zh_Hant", "hr", "gl", "pt_PT", - "cs", + "cs", "fo", // this happens when file does not matches correct // iso code for the language. ["ja_jp", "jpn_JP"] diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs index d1fbfe120..6667c90d3 100644 --- a/frontend/src/app/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -40,6 +40,7 @@ {:label "Ελληνική γλώσσα (community)" :value "el"} {:label "Русский (community)" :value "ru"} {:label "Český jazyk (community)" :value "cs"} + {:label "Føroyskt mál (community)" :value "fo"} {:label "עִבְרִית (community)" :value "he"} {:label "عربي/عربى (community)" :value "ar"} {:label "فارسی (community)" :value "fa"} From 42acae3ae32f378ebab88193f97ca83940b0ab8f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 11:01:00 +0200 Subject: [PATCH 3/7] :tada: Add korean lang --- frontend/gulpfile.js | 2 +- frontend/src/app/util/i18n.cljs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index db48b6c1c..2193173fb 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -49,7 +49,7 @@ function readLocales() { const langs = ["ar", "ca", "de", "el", "en", "eu", "it", "es", "fa", "fr", "he", "nb_NO", "pl", "pt_BR", "ro", "id", "ru", "tr", "zh_CN", "zh_Hant", "hr", "gl", "pt_PT", - "cs", "fo", + "cs", "fo", "ko", // this happens when file does not matches correct // iso code for the language. ["ja_jp", "jpn_JP"] diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs index 6667c90d3..b74ecb341 100644 --- a/frontend/src/app/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -41,6 +41,7 @@ {:label "Русский (community)" :value "ru"} {:label "Český jazyk (community)" :value "cs"} {:label "Føroyskt mál (community)" :value "fo"} + {:label "Korean (community)" :value "ko"} {:label "עִבְרִית (community)" :value "he"} {:label "عربي/عربى (community)" :value "ar"} {:label "فارسی (community)" :value "fa"} From f8d00c0e7fc3add461a0077e5322a57ba57bea87 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 11:02:58 +0200 Subject: [PATCH 4/7] :tada: Add latvian lang --- frontend/gulpfile.js | 2 +- frontend/src/app/util/i18n.cljs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 2193173fb..e185aa14a 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -49,7 +49,7 @@ function readLocales() { const langs = ["ar", "ca", "de", "el", "en", "eu", "it", "es", "fa", "fr", "he", "nb_NO", "pl", "pt_BR", "ro", "id", "ru", "tr", "zh_CN", "zh_Hant", "hr", "gl", "pt_PT", - "cs", "fo", "ko", + "cs", "fo", "ko", "lv", // this happens when file does not matches correct // iso code for the language. ["ja_jp", "jpn_JP"] diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs index b74ecb341..57e898ca2 100644 --- a/frontend/src/app/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -40,6 +40,7 @@ {:label "Ελληνική γλώσσα (community)" :value "el"} {:label "Русский (community)" :value "ru"} {:label "Český jazyk (community)" :value "cs"} + {:label "Latviešu valoda (community)" :value "lv"} {:label "Føroyskt mál (community)" :value "fo"} {:label "Korean (community)" :value "ko"} {:label "עִבְרִית (community)" :value "he"} From b5c160732e6bc75975560e035501f602604b8cac Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 11:07:03 +0200 Subject: [PATCH 5/7] :tada: Add ukranian lang --- frontend/gulpfile.js | 3 ++- frontend/src/app/util/i18n.cljs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index e185aa14a..6c6366443 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -52,7 +52,8 @@ function readLocales() { "cs", "fo", "ko", "lv", // this happens when file does not matches correct // iso code for the language. - ["ja_jp", "jpn_JP"] + ["ja_jp", "jpn_JP"], + ["uk", "ukr_UA"] ]; const result = {}; diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs index 57e898ca2..a1f053c73 100644 --- a/frontend/src/app/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -39,6 +39,7 @@ {:label "Türkçe (community)" :value "tr"} {:label "Ελληνική γλώσσα (community)" :value "el"} {:label "Русский (community)" :value "ru"} + {:label "Украї́нська мо́ва (community)" :value "uk"} {:label "Český jazyk (community)" :value "cs"} {:label "Latviešu valoda (community)" :value "lv"} {:label "Føroyskt mál (community)" :value "fo"} From 3311bf6ac04f6f010e5bf74b692c5ddee42240b7 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 11:11:15 +0200 Subject: [PATCH 6/7] :paperclip: Remove duplicated file --- frontend/gulpfile.js | 1 + frontend/translations/fi.po | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 frontend/translations/fi.po diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 6c6366443..d91859673 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -53,6 +53,7 @@ function readLocales() { // this happens when file does not matches correct // iso code for the language. ["ja_jp", "jpn_JP"], + // ["fi", "fin_FI"], ["uk", "ukr_UA"] ]; const result = {}; diff --git a/frontend/translations/fi.po b/frontend/translations/fi.po deleted file mode 100644 index b1fc23594..000000000 --- a/frontend/translations/fi.po +++ /dev/null @@ -1,6 +0,0 @@ -msgid "" -msgstr "" -"X-Generator: Weblate\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" \ No newline at end of file From c0ccc4a5c56e3a4994f6b1ac04ebd4ff512a3079 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 25 Apr 2023 12:00:03 +0200 Subject: [PATCH 7/7] :sparkles: Improve OICD attrs lookup mechanism --- backend/resources/climit.edn | 1 - backend/src/app/auth/oidc.clj | 46 ++++++++++++++++++++--------------- backend/src/app/config.clj | 4 +-- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/backend/resources/climit.edn b/backend/resources/climit.edn index 755568713..a1aacb28d 100644 --- a/backend/resources/climit.edn +++ b/backend/resources/climit.edn @@ -1,4 +1,3 @@ -;; Example climit.edn file ;; Required: concurrency ;; Optional: queue-size, ommited means Integer/MAX_VALUE {:update-file {:concurrency 1 :queue-size 3} diff --git a/backend/src/app/auth/oidc.clj b/backend/src/app/auth/oidc.clj index fca5d1058..b2def03c0 100644 --- a/backend/src/app/auth/oidc.clj +++ b/backend/src/app/auth/oidc.clj @@ -165,8 +165,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defn- retrieve-github-email - [cfg tdata info] - (or (some-> info :email p/resolved) + [cfg tdata props] + (or (some-> props :github/email p/resolved) (->> (http/req! cfg {:uri "https://api.github.com/user/emails" :headers {"Authorization" (dm/str (:type tdata) " " (:token tdata))} @@ -246,6 +246,11 @@ ;; HANDLERS ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defn- parse-attr-path + [provider path] + (let [[fitem & items] (str/split path "__")] + (into [(keyword (:name provider) fitem)] (map keyword) items))) + (defn- build-redirect-uri [{:keys [provider] :as cfg}] (let [public (u/uri (cf/get :public-uri))] @@ -316,6 +321,7 @@ :headers {"Authorization" (str (:type tdata) " " (:token tdata))} :timeout 6000 :method :get})) + (validate-response [response] (l/trace :hint "user info response" :status (:status response) @@ -328,26 +334,30 @@ :http-body (:body response))) response) - (get-email [info] + (get-email [props] ;; Allow providers hook into this for custom email ;; retrieval method. + (if-let [get-email-fn (:get-email-fn provider)] - (get-email-fn tdata info) - (let [attr-kw (cf/get :oidc-email-attr :email)] - (p/resolved (get info attr-kw))))) + (get-email-fn tdata props) + (let [attr-kw (cf/get :oidc-email-attr "email") + attr-ph (parse-attr-path provider attr-kw)] + (p/resolved (get-in props attr-ph))))) (get-name [info] - (let [attr-kw (cf/get :oidc-name-attr :name)] - (get info attr-kw))) + (let [attr-kw (cf/get :oidc-name-attr "name") + attr-ph (parse-attr-path provider attr-kw)] + (get-in info attr-ph))) (process-response [response] (p/let [info (-> response :body json/decode) - email (get-email info)] + props (qualify-props provider info) + email (get-email props)] + {:backend (:name provider) + :fullname (or (get-name props) email) :email email - :fullname (or (get-name info) email) - :props (->> (dissoc info :name :email) - (qualify-props provider))})) + :props props})) (validate-info [info] (l/trace :hint "authentication info" :info info) @@ -377,19 +387,15 @@ (defn get-info [{:keys [provider] :as cfg} {:keys [params] :as request}] - (letfn [(parse-oidc-attrs-path [path] - (let [[fitem & items] (str/split path "__")] - (into [(keyword "oidc" fitem)] (map keyword) items))) - - (validate-oidc [info] + (letfn [(validate-oidc [{:keys [props] :as info}] ;; If the provider is OIDC, we can proceed to check ;; roles if they are defined. (when (and (= "oidc" (:name provider)) (seq (:roles provider))) (let [expected-roles (into #{} (:roles provider)) - current-roles (let [roles (->> (cf/get :oidc-roles-attr "roles") - (parse-oidc-attrs-path) - (get-in info))] + current-roles (let [roles-kw (cf/get :oidc-roles-attr "roles") + roles-ph (parse-attr-path provider roles-kw) + roles (get-in props roles-ph)] (cond (string? roles) (into #{} (str/words roles)) (vector? roles) (into #{} roles) diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 8314ae1e5..00065e811 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -154,8 +154,8 @@ (s/def ::oidc-scopes ::us/set-of-strings) (s/def ::oidc-roles ::us/set-of-strings) (s/def ::oidc-roles-attr ::us/string) -(s/def ::oidc-email-attr ::us/keyword) -(s/def ::oidc-name-attr ::us/keyword) +(s/def ::oidc-email-attr ::us/string) +(s/def ::oidc-name-attr ::us/string) (s/def ::host ::us/string) (s/def ::http-server-port ::us/integer) (s/def ::http-server-host ::us/string)