Commit Graph

45 Commits

Author SHA1 Message Date
GitLab Bot aa54e0c45f Add latest changes from gitlab-org/gitlab@master 2024-11-26 00:26:35 +00:00
GitLab Bot 34a2cc5b74 Add latest changes from gitlab-org/gitlab@master 2024-02-19 00:11:41 +00:00
GitLab Bot 5f825c2ede Add latest changes from gitlab-org/gitlab@master 2023-06-26 18:08:59 +00:00
GitLab Bot 190734a48c Add latest changes from gitlab-org/gitlab@master 2023-04-25 21:16:20 +00:00
GitLab Bot 92c9eb5c69 Add latest changes from gitlab-org/gitlab@master 2022-12-25 21:09:02 +00:00
GitLab Bot e0b6b475f2 Add latest changes from gitlab-org/gitlab@master 2022-11-22 03:10:55 +00:00
GitLab Bot af770ba828 Add latest changes from gitlab-org/gitlab@master 2022-06-25 00:08:03 +00:00
GitLab Bot 57b795ee00 Add latest changes from gitlab-org/gitlab@master 2022-06-22 06:08:52 +00:00
GitLab Bot 8ed0a009f0 Add latest changes from gitlab-org/gitlab@master 2022-05-04 12:07:48 +00:00
GitLab Bot 249f395337 Add latest changes from gitlab-org/gitlab@master 2022-03-25 03:08:30 +00:00
GitLab Bot f9e0126cad Add latest changes from gitlab-org/gitlab@master 2021-11-16 21:12:05 +00:00
GitLab Bot c70a70ea42 Add latest changes from gitlab-org/gitlab@master 2021-08-20 15:10:24 +00:00
GitLab Bot 9ebfef6a3c Add latest changes from gitlab-org/gitlab@master 2020-11-04 15:08:41 +00:00
GitLab Bot d5cf5cf4f7 Add latest changes from gitlab-org/gitlab@master 2020-07-17 00:09:37 +00:00
GitLab Bot 4774fa00b7 Add latest changes from gitlab-org/gitlab@master 2020-06-15 15:08:20 +00:00
GitLab Bot e66d6781ef Add latest changes from gitlab-org/gitlab@master 2019-09-26 18:06:29 +00:00
Martin Wortschack 5660690787 Externalize strings in projects controllers
- concerns
- dashboard
- groups
- import
2019-03-27 16:52:52 +00:00
Stan Hu 88f2e9615c
Alias GitHub and BitBucket OAuth2 callback URLs
To prevent an OAuth2 covert redirect vulnerability, this commit adds and
uses an alias for the GitHub and BitBucket OAuth2 callback URLs to the
following paths:

GitHub: /users/auth/-/import/github
Bitbucket: /users/auth/-/import/bitbucket

This allows admins to put a more restrictive callback URL in the OAuth2
configuration settings. Instead of https://example.com, admins can now use:

https://example.com/users/auth

It's possible but not trivial to change Devise and OmniAuth to use a
different prefix for callback URLs instead of /users/auth. For now,
aliasing the import URLs under the /users/auth namespace should suffice.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56663
2019-01-31 16:52:48 +01:00
gfyoung be42c05054 Enable more frozen string in app/controllers/
Enables frozen string for the following:

* app/controllers/dashboard/**/*.rb
* app/controllers/explore/**/*.rb
* app/controllers/google_api/**/*.rb
* app/controllers/groups/**/*.rb
* app/controllers/import/**/*.rb
* app/controllers/instance_statistics/**/*.rb
* app/controllers/ldap/**/*.rb
* app/controllers/oauth/**/*.rb
* app/controllers/profiles/**/*.rb

Partially addresses #47424.
2018-09-23 12:48:02 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Stan Hu 3a722ff53f Show a more helpful error for import status
Importing a project from GitHub for a project namespace that already exists
would show an unhelpful error, "An error occurred while importing project."
We now add the base message from Projects::CreateService when this fails.

Closes #47365
2018-06-06 01:40:55 -07:00
Tiago Botelho bddbcaefc2 Backports every CE related change from ee-44542 to CE 2018-05-04 17:33:26 +02:00
Horatiu Eugen Vlad 1ad5df49b1 Moved o_auth/saml/ldap modules under gitlab/auth 2018-02-28 16:53:02 +01:00
Clement Ho 71c948d637 Replace $.post in importer status with axios 2018-02-09 11:14:48 +00:00
Stan Hu 07415e474e Fix Error 500 when Bitbucket importer does not have authorization
Closes #29739
2017-03-20 22:17:46 -07:00
Valery Sizov 26628fb91a BB importer: Fixed bug with putting expired token to a project.clone_url 2016-12-15 14:19:28 +02:00
Valery Sizov 858ec60482 Handling OAuth2 errors 2016-12-09 16:59:23 +02:00
Valery Sizov b12d654183 BitBuckpet importer. Refactoring. Iteration 2 2016-12-07 14:00:06 +02:00
Stan Hu 7953480646 Fix remaining Bitbucket controller specs 2016-11-21 16:47:30 -08:00
Stan Hu e2688feeb3 Address initial review comments 2016-11-21 16:47:27 -08:00
Stan Hu 478730bebd Support selection of different namespace and project destination 2016-11-21 16:47:27 -08:00
Stan Hu a095943051 Fix rebase failures with Bitbucket changes 2016-11-21 16:47:27 -08:00
Douglas Barbosa Alexandre 56cb4762d4 Refactoring Bitbucket import controller to use the new OAuth2 client 2016-11-21 16:47:25 -08:00
Douglas Barbosa Alexandre e293ffd48f Refactoring Import::BaseController#find_or_create_namespace 2016-08-31 16:54:15 -03:00
Douglas Barbosa Alexandre 325de662ce Don't create groups for unallowed users when importing projects 2016-08-31 12:55:45 -03:00
Grzegorz Bizon c0ebfea6ba Fix some useless access modifiers in the code 2016-07-19 14:16:54 +02:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Stan Hu ed1d4fa477 Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871
2015-08-23 09:23:44 -07:00
Stan Hu d7accda1ae Show incompatible projects in Bitbucket import status
See #1871
2015-08-07 07:07:08 -07:00
Douwe Maan 42ebd902de Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-07-28 15:33:16 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Douwe Maan 737f322e41 Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. 2015-03-31 16:34:13 +02:00
Douwe Maan 16c767814a Re-enable rescuing from Bitbucket OAuth errors. 2015-02-24 15:07:25 +01:00
Douwe Maan 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00