1
0
mirror of https://github.com/bitwarden/server.git synced 2024-12-11 15:17:44 +01:00
Commit Graph

3949 Commits

Author SHA1 Message Date
Justin Baur
bae03feffe
Revert filescoped (#2227)
* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2a.
2022-08-29 15:53:48 -04:00
Justin Baur
239286737d
Add git blame entry (#2226)
* Add entry and instructions

* Change wording

* Added step for resolving conflicts
2022-08-29 15:27:55 -04:00
Justin Baur
34fb4cca2a
Turn on file scoped namespaces (#2225) 2022-08-29 14:53:16 -04:00
Oscar Hinton
7c4521e0b4
[SM-153] Add scaffolded API integration test project (#2209) 2022-08-29 16:24:52 +02:00
Oscar Hinton
194c695cd0
[SM-151] Move EF Dapper tests to Infrastructure.EFIntegration.Test (#2204) 2022-08-29 09:40:59 -04:00
Michał Chęciński
2b2f9fafd2
Publish EventsProcessor and Icons Images to Prod ACR (#2210)
* Add steps to publish image to prod acr

* Add comments for testing

* Fix

* FIx

* Remove comments after testing

* Try to fix condition

* Try to fix

* uncomment testing
2022-08-25 10:02:24 +02:00
Micaiah Martin
61f4a27d2b
[DEVOPS-862] Update logic to workflow (#2194) 2022-08-24 08:42:59 -06:00
Oscar Hinton
308ae7641b
[SM-152] Add CI to verify OSS is still building (#2208) 2022-08-24 10:45:33 +02:00
André Filipe da Silva Bispo
c36d6fa3ba
[SG-614] Web Version Discrepancy
[SG-614] Fixed web/core version, they were switched. (#2207)
2022-08-23 10:31:29 +01:00
Kyle Spearrin
13d1e74d69
expand sources and tax_ids for stripe api 2020-08-27 (#2199) 2022-08-17 14:39:21 -04:00
github-actions[bot]
4b144f4cda
Bump version to 2022.8.4 (#2198)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-16 09:03:19 -06:00
Kyle Spearrin
8b323e67c1
parse user active path as string value (#2193) 2022-08-15 16:58:16 -04:00
Kyle Spearrin
62f29efb00
properly handle patch operations with path values (#2190) 2022-08-15 12:08:55 -04:00
Kyle Spearrin
a89bfdfe2b
choose other emails when primary not available (#2188) 2022-08-15 09:44:38 -04:00
github-actions[bot]
5cbdee1379
Bump version to 2022.8.3 (#2186)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-11 15:00:55 -06:00
Micaiah Martin
c33732d583
[DEVOPS-862] Updates the paths trigger (#2180) 2022-08-11 15:54:37 +00:00
Micaiah Martin
b86a04cef9
[DEVOPS-862] Add protections around SQL migration modification changes (#2177) 2022-08-10 12:19:52 -06:00
Kyle Spearrin
4fc5347f15
respect allowanonymous on scim auth (#2173) 2022-08-09 12:14:17 -04:00
Chad Scharf
37641ba08b
Cherry pick/stripe sdk fixes (#2170)
* update stripe sdk (#2166)

* Bump version to 2022.8.1 (#2167)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit eaca9a5864)

* added setting to toggle stripe api version errors (#2168)

* Bump version to 2022.8.2 (#2169)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 3d7e5e165c)

Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-09 09:32:18 -04:00
github-actions[bot]
3d7e5e165c
Bump version to 2022.8.2 (#2169)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-03 23:48:41 -06:00
github-actions[bot]
eaca9a5864
Bump version to 2022.8.1 (#2167)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-03 22:46:17 -06:00
Todd Martin
524ceb622c
Changes to clean up deployment creation in workflow jobs. (#2160)
Co-authored-by: Todd Martin <>
2022-08-03 11:39:35 -04:00
Matt Gibson
dad666fc96
Add Microsoft.Data.SqlClient back as quartz dependency (#2161) 2022-08-02 17:52:34 -05:00
Thomas Rittson
ebdd30f5d4
[EC-388] Enforce organization policies when restoring user (#2152) 2022-08-02 17:09:22 -04:00
github-actions[bot]
da3a3de7f2
Bumped version to 2022.8.0 (#2159)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-02 13:04:14 -07:00
dgoodman-bw
95b727e3f1
PS-1027 - prevent encoding of the organization name in master password reset email (#2147) 2022-08-02 12:57:56 -07:00
Oscar Hinton
1cad0268c0
[SM-142] Rename CommCore to Commercial.Core (#2158)
* Rename CommCore to Commercial.Core
2022-08-02 20:41:18 +02:00
Rui Tomé
038d5e7734
[EC-276] Admin with custom permission is unable to manage all collections (#2143)
* Updated CollectionService.GetOrganizationCollections to check if the user has permissions to view all collections

Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
2022-07-28 17:23:43 +01:00
Rui Tomé
169a4381dd
[EC-247] Add columns to provider portal clients table (#2136)
* Added migration script to alter ProviderOrganizationOrganizationDetailsView to add new columns UserCount, Seats and Plan

* Modified EF query ProviderOrganizationOrganizationDetailsReadByProviderIdQuery

* Modified model to output new view columns

* Updated view to count only active users

* Filtering the organization user count by only confirmed users
2022-07-28 09:31:03 +01:00
Addison Beck
d1db4d31cb
[fix] Address QA found defects for the Stripe Subscriptions admin tool (#2150)
* [fix] Clear the page on Stripe Subscription search change
[SG-404]

* [fix] Ensure page is null when selecting all Stripe Subscriptions for an action
[SG-404]

* [feat] Allow Stripe Subscriptions to be filtered by a test clock
[SG-404]
2022-07-26 13:59:41 -04:00
Chad Scharf
d1a2e58ce1
EC-261 - Update OrganizationLicense for SCIM (#2151) 2022-07-26 13:04:59 -04:00
Matt Gibson
c0f2255569
[PS-617] Fix null value detection on ssoToken parameter (#2085)
* Fix null value detection on ssoToken parameter

* Use TryGet

* Format

Co-authored-by: Justin Baur <admin@justinbaur.com>
2022-07-26 10:53:16 -04:00
Oscar Hinton
2979fde0f7
Remove unused qwerty helpers (#2149) 2022-07-26 13:27:09 +02:00
Thomas Rittson
66de2f34f5
Fix invalid SCIM invites and SCIM log directory (#2148)
SCIM container needs to mount ../core to have access to data protection
certificates which are required for invite tokens to work
2022-07-26 07:08:37 -04:00
Todd Martin
dd75e8886a
[ENG-71] Updated release job to create and update Github deployment for Jira integration (#2141)
* [ENG-71] updated release job to have Github deployment

* [ENG-71] Updated to use commit instead of v2.

* [ENG-71] Updated to track each server deployment.

Co-authored-by: Todd Martin <>
2022-07-25 17:19:56 -04:00
Rui Tomé
7dfb04298d
[EC-92] Add organization vault export to event logs (#2128)
* Added nullable OrganizationId to EventModel

* Added EventType Organization_ClientExportedVault

* Updated CollectController to save the event Organization_ClientExportedVault

* Added OrganizationExportResponseModel to encapsulate Organization Export data

* Added OrganizationExportController to have a single endpoint for Organization vault export

* Added method GetOrganizationCollections to ICollectionService to get collections for an organization

* Added GetOrganizationCiphers to ICipherService to get ciphers for an organization

* Updated controllers to use new methods in ICollectionService and ICipherService
2022-07-25 09:56:23 +01:00
Thomas Rittson
f6a18db582
[EC-338] Update SCIM code naming conventions (revoked/restore) (#2140)
* Keep old endpoints but mark as deprecated
* Do not change existing sproc naming
2022-07-25 10:47:44 +10:00
Kyle Spearrin
cf16be16c6
SCIM: Associate users to group on PUT/POST (#2139)
* associate users to group on PUT/POST

* fix logic
2022-07-21 13:44:27 -04:00
Robyn MacCallum
378b54524f
[SG 475] Fix error thrown when changing payment method (#2137)
* Add null check for sources

* Add expand to get customer sources
2022-07-21 12:55:57 -04:00
Micaiah Martin
f736008cb3
Update workflows for SCIM support (#2133) 2022-07-21 14:36:40 +00:00
Thomas Rittson
ac183363bd
Set UseScim flag for new organizations (#2134) 2022-07-21 08:26:51 -04:00
Thomas Rittson
8885b30500
[EC-336] Fix invalid user invites when invited via SCIM (#2135)
* Fix invalid user invites when invited via SCIM

* Fix linting
2022-07-21 08:26:32 -04:00
Micaiah Martin
39d77cf09c
Update workflows for SCIM support (#2131) 2022-07-20 10:47:19 -06:00
Shane Melton
4e3d8172ff
Re-evaluate lock files to ensure they match project dependencies (#2132) 2022-07-20 09:10:08 -07:00
Thomas Rittson
4f145b3938
Update restore/revoke error message wording (#2126) 2022-07-20 11:42:06 +10:00
Thomas Rittson
28ca17109a
Configure EventsProcessor to use Azurite for local dev (#2120) 2022-07-20 09:26:21 +10:00
Vince Grassia
45bbbc4beb
Update 'Dry Run' path in Release workflow (#2124) 2022-07-19 15:00:57 -04:00
Shane Melton
7d40b38352
[PS-93] Distributed Ip rate limiting (#2060)
* Upgrade AspNetCoreRateLimiter and enable redis distributed cache for rate limiting.

- Upgrades AspNetCoreRateLimiter to 4.0.2, which required updating NewtonSoft.Json to 13.0.1.
- Replaces Microsoft.Extensions.Caching.Redis with Microsoft.Extensions.Caching.StackExchangeRedis as the original was deprecated and conflicted with the latest AspNetCoreRateLimiter
- Adds startup task to Program.cs for Api/Identity projects to support AspNetCoreRateLimiters breaking changes for seeding its stores.
- Adds a Redis connection string option to GlobalSettings

Signed-off-by: Shane Melton <smelton@bitwarden.com>

* Cleanup Redis distributed cache registration

- Add new AddDistributedCache service collection extension to add either a Memory or Redis distributed cache.
- Remove distributed cache registration from Identity service collection extension.
- Add IpRateLimitSeedStartupService.cs to run at application startup to seed the Ip rate limiting policies.

Signed-off-by: Shane Melton <smelton@bitwarden.com>

* Add caching configuration to SSO Startup.cs

Signed-off-by: Shane Melton <smelton@bitwarden.com>

* Add ProjectName as an instance name for Redis options

Signed-off-by: Shane Melton <smelton@bitwarden.com>

* Use distributed cache in CustomIpRateLimitMiddleware.cs

Signed-off-by: Shane Melton <smelton@bitwarden.com>

* Undo changes to Program.cs and launchSettings.json

* Move new service collection extensions to SharedWeb

* Upgrade Caching.StackExchangeRedis package to v6

* Cleanup and fix leftover merge conflicts

* Remove use of Newtonsoft.Json in distributed cache extensions

* Cleanup more formatting

* Fix formatting

* Fix startup issue caused by merge and fix integration test

Signed-off-by: Shane Melton <smelton@bitwarden.com>

* Linting fix

Signed-off-by: Shane Melton <smelton@bitwarden.com>
2022-07-19 11:58:32 -07:00
Kyle Spearrin
1764d2446e
lowercase op string comparisons (#2129) 2022-07-19 13:32:00 -04:00
Micaiah Martin
903273885b
Add SCIM image build and publish (#2125) 2022-07-19 07:35:26 -06:00