From 5990258837fc13b0e8adf667cab9accd68ddc9c1 Mon Sep 17 00:00:00 2001
From: Alexander Chernov <blackav@gmail.com>
Date: Mon, 3 Jun 2024 08:31:44 +0300
Subject: [PATCH] add OIDC login buttons

---
 csp/contests/reg_login_page.csp    |  9 +++++++++
 csp/contests/unpriv_login_page.csp |  9 +++++++++
 csp/super-server/login_page.csp    | 18 ++++++++++++++++++
 style/icons/oidc-logo.svg          |  3 +++
 4 files changed, 39 insertions(+)
 create mode 100644 style/icons/oidc-logo.svg

diff --git a/csp/contests/reg_login_page.csp b/csp/contests/reg_login_page.csp
index 30c8bd4c2e..49f786b47c 100644
--- a/csp/contests/reg_login_page.csp
+++ b/csp/contests/reg_login_page.csp
@@ -118,6 +118,10 @@
     <s:param name="contest_id" value="phr->contest_id" />
     <s:param name="provider" value='"yandex"' />
 </s:url>
+<s:url name="LoginWithOIDCUrl" script="client" ac="'oauth-login-1'">
+    <s:param name="contest_id" value="phr->contest_id" />
+    <s:param name="provider" value='"oidc"' />
+</s:url>
 <p>
 <%
     if (oauth_is_available_num(phr->config, 1)) {
@@ -133,6 +137,11 @@
     if (oauth_is_available_num(phr->config, 3)) {
 %>
 <s:a url="LoginWithYandexUrl"><img src="<s:config name="style-prefix" />icons/yandex-logo.png" alt="yandex auth"></img></s:a>
+<%
+    }
+    if (oauth_is_available_num(phr->config, 4)) {
+%>
+<s:a url="LoginWithOIDCUrl"><img src="<s:config name="style-prefix" />icons/oidc-logo.svg" alt="OIDC auth" height="46px"></img></s:a>
 <%
     }
 %>
diff --git a/csp/contests/unpriv_login_page.csp b/csp/contests/unpriv_login_page.csp
index 3ad0a7fe6b..0c00c228ce 100644
--- a/csp/contests/unpriv_login_page.csp
+++ b/csp/contests/unpriv_login_page.csp
@@ -143,6 +143,10 @@
     <s:param name="contest_id" value="phr->contest_id" />
     <s:param name="provider" value='"yandex"' />
 </s:url>
+<s:url name="LoginWithOIDCUrl" ac="oauth-login-1">
+    <s:param name="contest_id" value="phr->contest_id" />
+    <s:param name="provider" value='"oidc"' />
+</s:url>
 <p>
 <%
     if (oauth_is_available_num(phr->config, 1)) {
@@ -158,6 +162,11 @@
     if (oauth_is_available_num(phr->config, 3)) {
 %>
 <s:a url="LoginWithYandexUrl"><img src="<s:config name="style-prefix" />icons/yandex-logo.png" alt="yandex auth"></img></s:a>
+<%
+    }
+    if (oauth_is_available_num(phr->config, 4)) {
+%>
+<s:a url="LoginWithOIDCUrl"><img src="<s:config name="style-prefix" />icons/oidc-logo.svg" alt="OIDC auth" height="46px"></img></s:a>
 <%
     }
 %>
diff --git a/csp/super-server/login_page.csp b/csp/super-server/login_page.csp
index 483f87f2f7..07ab405d5f 100644
--- a/csp/super-server/login_page.csp
+++ b/csp/super-server/login_page.csp
@@ -55,6 +55,14 @@ is_configured(
     <s:param name="role" value='"admin"' />
     <s:param name="provider" value='"vk"' />
 </s:url>
+<s:url name="LoginWithYandexUrl" script="client" ac="'oauth-login-1'">
+    <s:param name="role" value='"admin"' />
+    <s:param name="provider" value='"yandex"' />
+</s:url>
+<s:url name="LoginWithOIDCUrl" script="client" ac="'oauth-login-1'">
+    <s:param name="role" value='"admin"' />
+    <s:param name="provider" value='"oidc"' />
+</s:url>
 <p>
 <%
     if (is_configured(phr->config, "google")) {
@@ -65,6 +73,16 @@ is_configured(
     if (is_configured(phr->config, "vk")) {
 %>
 <s:a url="LoginWithVKUrl"><img src="<s:config name="style-prefix" />icons/vk-logo.jpeg" alt="vk auth" width="46"></img></s:a>
+<%
+    }
+    if (is_configured(phr->config, "yandex")) {
+%>
+<s:a url="LoginWithYandexUrl"><img src="<s:config name="style-prefix" />icons/yandex-logo.png" alt="yandex auth"></img></s:a>
+<%
+    }
+    if (is_configured(phr->config, "oidc")) {
+%>
+<s:a url="LoginWithOIDCUrl"><img src="<s:config name="style-prefix" />icons/oidc-logo.svg" alt="OIDC auth" width="46"></img></s:a>
 <%
     }
 %>
diff --git a/style/icons/oidc-logo.svg b/style/icons/oidc-logo.svg
new file mode 100644
index 0000000000..1fad1c6c18
--- /dev/null
+++ b/style/icons/oidc-logo.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="320" height="120" id="svg2593" xml:space="preserve"><defs id="defs2596"><clipPath id="clipPath2616"><path d="M 0,14400 L 14400,14400 L 14400,0 L 0,0 L 0,14400 z" id="path2618"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,-8601.9012,9121.1624)" id="g2602"><g transform="matrix(0.375,0,0,0.375,4301.4506,4557.5812)" id="g2734"><g id="g2726"><g transform="translate(6998.0969,7259.1135)" id="g2604"><path d="M 0,0 L 0,-159.939 L 0,-180 L 32,-164.939 L 32,15.633 L 0,0 z" id="path2606" style="fill:#f8931e;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(7108.9192,7206.3137)" id="g2608"><path d="M 0,0 L 4.417,-45.864 L -57.466,-32.4" id="path2610" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(6934.0969,7147.6213)" id="g2620"><path d="M 0,0 C 0,22.674 24.707,41.769 58.383,47.598 L 58.383,67.923 C 6.873,61.697 -32,33.656 -32,0 C -32,-34.869 9.725,-63.709 64,-68.508 L 64,-48.447 C 27.484,-43.869 0,-23.919 0,0 M 101.617,67.915 L 101.617,47.598 C 115.016,45.279 127.002,40.871 136.568,34.958 L 159.195,48.942 C 143.775,58.473 123.873,65.225 101.617,67.915" id="path2622" style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g><g id="g2713"><g transform="translate(7160.1521,7143.8156)" id="g2624" style="fill:#000000"><path d="M 0,0 C 1.155,-4.336 2.973,-8.238 5.451,-11.707 C 7.928,-15.176 11.106,-17.963 14.989,-20.068 C 18.87,-22.174 23.494,-23.227 28.863,-23.227 C 34.231,-23.227 38.854,-22.174 42.738,-20.068 C 46.619,-17.963 49.799,-15.176 52.275,-11.707 C 54.754,-8.238 56.569,-4.336 57.727,0 C 58.883,4.335 59.461,8.733 59.461,13.192 C 59.461,17.651 58.883,22.05 57.727,26.386 C 56.569,30.722 54.754,34.624 52.275,38.092 C 49.799,41.561 46.619,44.348 42.738,46.454 C 38.854,48.56 34.231,49.613 28.863,49.613 C 23.494,49.613 18.87,48.56 14.989,46.454 C 11.106,44.348 7.928,41.561 5.451,38.092 C 2.973,34.624 1.155,30.722 0,26.386 C -1.158,22.05 -1.734,17.651 -1.734,13.192 C -1.734,8.733 -1.158,4.335 0,0 M -10.839,30.598 C -9.064,36.172 -6.401,41.106 -2.849,45.401 C 0.701,49.694 5.12,53.122 10.406,55.683 C 15.69,58.241 21.843,59.523 28.863,59.523 C 35.882,59.523 42.035,58.241 47.32,55.683 C 52.605,53.122 57.024,49.694 60.576,45.401 C 64.126,41.106 66.789,36.172 68.566,30.598 C 70.341,25.022 71.229,19.22 71.229,13.192 C 71.229,7.163 70.341,1.362 68.566,-4.212 C 66.789,-9.787 64.126,-14.723 60.576,-19.016 C 57.024,-23.311 52.605,-26.717 47.32,-29.234 C 42.035,-31.754 35.882,-33.014 28.863,-33.014 C 21.843,-33.014 15.69,-31.754 10.406,-29.234 C 5.12,-26.717 0.701,-23.311 -2.849,-19.016 C -6.401,-14.723 -9.064,-9.787 -10.839,-4.212 C -12.616,1.362 -13.503,7.163 -13.503,13.192 C -13.503,19.22 -12.616,25.022 -10.839,30.598" id="path2626" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(7289.0456,7154.0979)" id="g2628" style="fill:#000000"><path d="M 0,0 C -0.786,2.849 -1.981,5.389 -3.593,7.617 C -5.203,9.848 -7.269,11.623 -9.786,12.944 C -12.307,14.265 -15.259,14.926 -18.644,14.926 C -22.194,14.926 -25.209,14.225 -27.687,12.82 C -30.164,11.416 -32.188,9.578 -33.757,7.309 C -35.326,5.035 -36.463,2.456 -37.163,-0.434 C -37.866,-3.326 -38.216,-6.256 -38.216,-9.229 C -38.216,-12.368 -37.845,-15.403 -37.102,-18.335 C -36.358,-21.267 -35.181,-23.847 -33.571,-26.077 C -31.96,-28.306 -29.876,-30.103 -27.315,-31.466 C -24.757,-32.827 -21.659,-33.509 -18.024,-33.509 C -14.392,-33.509 -11.356,-32.808 -8.919,-31.403 C -6.484,-29.999 -4.521,-28.142 -3.035,-25.829 C -1.548,-23.517 -0.476,-20.874 0.186,-17.901 C 0.846,-14.929 1.177,-11.874 1.177,-8.733 C 1.177,-5.761 0.784,-2.85 0,0 M -37.845,22.731 L -37.845,14.06 L -37.597,14.06 C -35.862,17.609 -33.138,20.191 -29.421,21.803 C -25.704,23.412 -21.616,24.217 -17.157,24.217 C -12.202,24.217 -7.888,23.308 -4.212,21.492 C -0.538,19.675 2.519,17.219 4.955,14.121 C 7.39,11.024 9.229,7.451 10.468,3.406 C 11.706,-0.641 12.326,-4.936 12.326,-9.478 C 12.326,-14.021 11.726,-18.315 10.53,-22.36 C 9.331,-26.407 7.514,-29.938 5.079,-32.952 C 2.642,-35.968 -0.415,-38.341 -4.088,-40.075 C -7.764,-41.81 -12.038,-42.677 -16.909,-42.677 C -18.479,-42.677 -20.235,-42.511 -22.174,-42.181 C -24.116,-41.849 -26.036,-41.313 -27.935,-40.569 C -29.835,-39.827 -31.631,-38.817 -33.323,-37.536 C -35.017,-36.255 -36.44,-34.667 -37.597,-32.767 L -37.845,-32.767 L -37.845,-65.718 L -48.374,-65.718 L -48.374,22.731 L -37.845,22.731 z" id="path2630" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(7354.0798,7157.9992)" id="g2632" style="fill:#000000"><path d="M 0,0 C -0.949,2.229 -2.23,4.15 -3.842,5.761 C -5.451,7.371 -7.352,8.65 -9.539,9.601 C -11.729,10.55 -14.143,11.024 -16.785,11.024 C -19.51,11.024 -21.969,10.55 -24.154,9.601 C -26.345,8.65 -28.225,7.349 -29.793,5.698 C -31.363,4.046 -32.602,2.126 -33.51,-0.062 C -34.418,-2.251 -34.955,-4.583 -35.119,-7.062 L 1.672,-7.062 C 1.506,-4.583 0.949,-2.229 0,0 M 2.539,-41.127 C -2.252,-44.762 -8.281,-46.578 -15.547,-46.578 C -20.668,-46.578 -25.105,-45.75 -28.863,-44.1 C -32.622,-42.449 -35.781,-40.137 -38.34,-37.162 C -40.9,-34.189 -42.82,-30.641 -44.1,-26.51 C -45.382,-22.381 -46.104,-17.881 -46.268,-13.007 C -46.268,-8.136 -45.525,-3.676 -44.039,0.372 C -42.552,4.417 -40.467,7.929 -37.782,10.901 C -35.1,13.874 -31.92,16.185 -28.244,17.839 C -24.57,19.49 -20.545,20.316 -16.166,20.316 C -10.469,20.316 -5.74,19.14 -1.982,16.785 C 1.773,14.432 4.789,11.438 7.061,7.804 C 9.33,4.169 10.9,0.205 11.77,-4.087 C 12.635,-8.383 12.986,-12.471 12.822,-16.352 L -35.119,-16.352 C -35.203,-19.16 -34.871,-21.824 -34.129,-24.342 C -33.385,-26.861 -32.188,-29.092 -30.535,-31.031 C -28.885,-32.973 -26.777,-34.521 -24.219,-35.676 C -21.658,-36.834 -18.643,-37.41 -15.174,-37.41 C -10.715,-37.41 -7.063,-36.379 -4.211,-34.314 C -1.363,-32.25 0.514,-29.111 1.424,-24.898 L 11.83,-24.898 C 10.424,-32.084 7.326,-37.494 2.539,-41.127" id="path2634" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(7383.9958,7176.8288)" id="g2636" style="fill:#000000"><path d="M 0,0 L 0,-10.159 L 0.246,-10.159 C 4.623,-2.397 11.561,1.486 21.059,1.486 C 25.27,1.486 28.779,0.907 31.588,-0.249 C 34.395,-1.405 36.666,-3.016 38.402,-5.079 C 40.135,-7.145 41.354,-9.6 42.055,-12.45 C 42.756,-15.299 43.107,-18.458 43.107,-21.926 L 43.107,-64.044 L 32.578,-64.044 L 32.578,-20.688 C 32.578,-16.723 31.422,-13.586 29.111,-11.273 C 26.799,-8.961 23.617,-7.805 19.57,-7.805 C 16.352,-7.805 13.563,-8.299 11.209,-9.291 C 8.855,-10.282 6.893,-11.687 5.326,-13.502 C 3.756,-15.32 2.578,-17.448 1.795,-19.882 C 1.01,-22.319 0.619,-24.983 0.619,-27.872 L 0.619,-64.044 L -9.91,-64.044 L -9.91,0 L 0,0 z" id="path2638" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><path d="M 7454.4799,7112.7846 L 7441.4719,7112.7846 L 7441.4719,7201.2326 L 7454.4799,7201.2326 L 7454.4799,7112.7846 z" id="path2640" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/><g transform="translate(7499.445,7122.6945)" id="g2642" style="fill:#000000"><path d="M 0,0 C 1.322,0 2.975,0.104 4.955,0.311 C 6.938,0.516 9.045,1.01 11.273,1.797 C 13.504,2.58 15.713,3.717 17.9,5.203 C 20.088,6.689 22.053,8.713 23.783,11.273 C 25.52,13.832 26.943,17.033 28.059,20.873 C 29.174,24.714 29.73,29.358 29.73,34.81 C 29.73,40.094 29.213,44.821 28.184,48.993 C 27.15,53.163 25.459,56.714 23.104,59.646 C 20.75,62.577 17.717,64.807 14,66.336 C 10.283,67.863 5.699,68.628 0.248,68.628 L -19.572,68.628 L -19.572,0 L 0,0 z M -0.992,78.538 C 12.635,78.538 23.123,75.07 30.475,68.132 C 37.824,61.195 41.5,50.623 41.5,36.419 C 41.5,28.987 40.672,22.4 39.021,16.662 C 37.369,10.92 34.811,6.09 31.342,2.168 C 27.873,-1.756 23.455,-4.75 18.086,-6.813 C 12.717,-8.879 6.359,-9.91 -0.992,-9.91 L -31.342,-9.91 L -31.342,78.538 L -0.992,78.538 z" id="path2644" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g></g></g></svg>
\ No newline at end of file