opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1' into stable-3.2 

* stable-3.1:
  OpenID: Remove support for Yahoo! OpenID provider
  e2e-tests: Add a force option to delete project scenario
  Set version to 3.1.14-SNAPSHOT
  Set version to 3.1.13

Change-Id: I866e4843d95aca8a638f7bac84b81656a5631140
This commit is contained in:
David Ostrovsky 2021-04-05 19:35:46 +02:00
parent 47e8069014 6eef4c4813
commit 32f6bf8ff4
7 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config-sso.txt
View File

@ -44,9 +44,9 @@ will match any OpenID provider on the Internet:
* `http://` -- trust all OpenID providers using the HTTP protocol
* `https://` -- trust all OpenID providers using the HTTPS protocol
To trust only Yahoo!:
To trust only Launchpad:
----
git config --file $site_path/etc/gerrit.config auth.trustedOpenID https://me.yahoo.com
git config --file $site_path/etc/gerrit.config auth.trustedOpenID https://login.launchpad.net/+openid
----
=== Database Schema

6
Documentation/dev-design.txt
View File

@ -256,11 +256,7 @@ change through the native Git protocol.
Gerrit integrates with any OpenID provider for user authentication,
making it easier for users to join a Gerrit site and manage their
authentication credentials to it. To make use of Google Accounts
as an OpenID provider easier, Gerrit has a shorthand "Sign in with
a Google Account" link on its sign-in screen. Gerrit also supports
a shorthand sign in link for Yahoo!. Other providers may also be
supported more directly in the future.
authentication credentials to it.
Site administrators may limit the range of OpenID providers to
a subset of "reliable providers". Users may continue to use

3
e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/DeleteProject-body.json Normal file
View File

@ -0,0 +1,3 @@
{
"force": "${force_project_deletion}"
}

6
e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala
View File

@ -20,6 +20,7 @@ import io.gatling.core.structure.ScenarioBuilder
class DeleteProject extends ProjectSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
private val forceKey = "force_project_deletion"
def this(projectName: String) {
this()
@ -28,7 +29,10 @@ class DeleteProject extends ProjectSimulation {
val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(httpRequest)
.exec(session => {
session.set(forceKey, getProperty(forceKey, "false"))
})
.exec(httpRequest.body(ElFileBody(body)).asJson)
setUp(
test.inject(

1
java/com/google/gerrit/common/auth/openid/OpenIdUrls.java
View File

@ -18,5 +18,4 @@ public class OpenIdUrls {
public static final String LASTID_COOKIE = "gerrit.last_openid";
public static final String URL_LAUNCHPAD = "https://login.launchpad.net/+openid";
public static final String URL_YAHOO = "https://me.yahoo.com";
}

4
java/com/google/gerrit/httpd/auth/openid/LoginForm.java
View File

@ -59,9 +59,7 @@ class LoginForm extends HttpServlet {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static final ImmutableMap<String, String> ALL_PROVIDERS =
ImmutableMap.of(
"launchpad", OpenIdUrls.URL_LAUNCHPAD,
"yahoo", OpenIdUrls.URL_YAHOO);
ImmutableMap.of("launchpad", OpenIdUrls.URL_LAUNCHPAD);
private final ImmutableSet<String> suggestProviders;
private final Provider<String> urlProvider;

5
resources/com/google/gerrit/httpd/auth/openid/LoginForm.html
View File

@ -75,11 +75,6 @@
<a href="?id=https://login.launchpad.net/%2Bopenid" id="id_launchpad">Sign in with a Launchpad ID</a>
</div>
<div id="provider_yahoo">
<img height="16" width="16" src="data:image/gif;base64,R0lGODlhEAAQAPECAAAAAP8AAP///8zMzCH5BAEAAAMALAAAAAAQABAAAAIqnI+py30BY3AgAjCkfJDjiIAQlgUkNxqWkqrm0honKk7KhZOzw/f+fygAADs=" />
<a href="?id=https://me.yahoo.com" id="id_yahoo">Sign in with a Yahoo! ID</a>
</div>
<div style="margin-top: 25px;">
<h2>What is OpenID?</h2>
<p>OpenID provides secure single-sign-on, without revealing your passwords to this website.</p>