1
0
mirror of https://github.com/bitwarden/server.git synced 2024-12-01 13:43:23 +01:00
Commit Graph

3978 Commits

Author SHA1 Message Date
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
Thomas Rittson
75960d6e6d
Add migration script to rebuild OrganizationView (#2127) 2022-07-19 09:10:44 -04:00
Thomas Avery
8c0996efec
[SM-82] Add HttpController Attribute to protect secrets manager controllers during development (#2117)
* Adding development only attribute for sm API

* dotnet format changes

* Swapping attribute name to SecretsManager
2022-07-18 09:05:26 -05:00
Jake Fink
be146a8f62
update OrgUserDetailsView to include PlanType and other sponsorship parameters previously removed (#2122) 2022-07-17 20:28:46 -04:00
Thomas Rittson
6628dc3336
[EC-315] Record user IP and device type for OrgUser and ProviderUser events (#2119) 2022-07-18 10:24:46 +10:00
Rui Tomé
6e19bfeb22
[EC-307] Fresh desk custom fields integration (#2114)
* Using correct ILogger on FreshdeskController

* Submitting custom fields to Freshdesk

* Set up FreshdeskController to use IHttpClientFactory

* Added unit test for FreshdeskController

* Moved ControllerCustomizeAttribute and ControllerCustomization to Common

* Modified FreshdeskController to use FreshdeskWebhookModel; Edited unit tests to use AutoFixture
2022-07-15 17:10:56 +01:00
Justin Baur
448e255fb6
Fix flaky test (#2121) 2022-07-15 11:52:36 -04:00
Michał Chęciński
4a7c39b08f
Add version change check in the version bump workflow (#2118) 2022-07-15 11:08:42 +02:00
Chad Scharf
19b8d8281a
[EC-261] SCIM (#2105)
* scim project stub

* some scim models and v2 controllers

* implement some v2 scim endpoints

* fix spacing

* api key auth

* EC-261 - SCIM Org API Key and connection type config

* EC-261 - Fix lint errors/formatting

* updates for okta implementation testing

* fix var ref

* updates from testing with Okta

* implement scim context via provider parsing

* support single and list of ids for add/remove groups

* log ops not handled

* touch up scim context

* group list filtering

* EC-261 - Additional SCIM provider types

* EC-265 - UseScim flag and license update

* EC-265 - SCIM provider type of default (0)

* EC-265 - Add Scim URL and update connection validation

* EC-265 - Model validation and cleanup for SCIM keys

* implement scim org connection

* EC-265 - Ensure ServiceUrl is not persisted to DB

* EC-265 - Exclude provider type from DB if not configured

* EC-261 - EF Migrations for SCIM

* add docker builds for scim

* EC-261 - Fix failing permissions tests

* EC-261 - Fix unit tests and pgsql migrations

* Formatting fixes from linter

* EC-265 - Remove service URL from scim config

* EC-265 - Fix unit tests, removed wayward validation

* EC-265 - Require self-hosted for billing sync org conn

* EC-265 - Fix formatting issues - whitespace

* EC-261 - PR feedback and cleanup

* scim constants rename

* no scim settings right now

* update project name

* delete package lock

* update appsettings configs for scim

* use default scim provider for context

Co-authored-by: Kyle Spearrin <kyle.spearrin@gmail.com>
2022-07-14 15:58:48 -04:00
Addison Beck
c5852db6ed
[feat] Allow CS to perform bulk actions on Stripe subscriptions from the Admin portal (#2116)
* [feat] Allow CS to perform bulk actions on Stripe subscriptions from the Admin portal

* [fix] An unrelated lint error
2022-07-13 10:04:58 -04:00
Michał Chęciński
4b43951b59
Remove tagging Docker images latest on release (#2098) 2022-07-13 15:44:57 +02:00
Jake Fink
54cf3de11b
[EC-284] Prevent duplicate organization invites (#2113)
* prevent duplicate organization invites with test

* formatting
2022-07-13 09:21:28 -04:00
Vince Grassia
62bf4c2385
Update Version Bump action hash (#2115) 2022-07-12 12:54:36 -04:00
Federico Maccaroni
ddd3e47df5
Update GlobalSettings.cs (#2112) 2022-07-11 18:31:08 -03:00
Micaiah Martin
5e1e634632
Require lint job before building artifacts (#2109) 2022-07-11 15:30:52 -06:00
Federico Maccaroni
5ba988ebd8
[EC-309] Change Device Verification default global setting value to false (#2106)
* EC-309 Change device verification default global setting value to false

* Update src/Core/Settings/GlobalSettings.cs

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
2022-07-11 18:23:31 -03:00
github-actions[bot]
92cd9179cb
Bump version to 2022.6.2 (#2111)
* Bumped version to 2022.6.2

* manually bump the version in server

* fixing the newline at the end of the file

* Revert "fixing the newline at the end of the file"

This reverts commit 805e0ceca4.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Joseph Flinn <joseph.s.flinn@gmail.com>
2022-07-11 14:10:03 -07:00
Thomas Avery
b60357eee9
Fixing missed email template (#2099) 2022-07-11 12:45:55 -05:00
Brandon Maharaj
0a334cc928
[SG-199] Move MP hint to MP change form (#2080)
* chore: backend changes

* fixed: test

* fix: lint
2022-07-11 09:28:14 -04:00
Gbubemi Smith
e9a88b5505
made the get plans endpoint anonymous (#2107) 2022-07-08 17:40:36 +01:00
github-actions[bot]
99ec5d5843
Bumped version to 2022.6.1 (#2102)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-07-06 15:56:04 -07:00
Federico Maccaroni
580987f0e5
EC-293 Fix device verification state when getting its settings (#2094) 2022-07-05 18:44:07 -03:00