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

277 Commits

Author SHA1 Message Date
Opeyemi
3f1f6b576a
[DEVOPS-1657] - UPDATE: Adds k8s deploy trigger on main branch (#3597) 2023-12-19 17:05:02 +00:00
Oscar Hinton
1b379485a5
Add devops prefix to github actions and docker (#3595) 2023-12-19 17:29:04 +01:00
Vince Grassia
5ca47d2e96
Merge _cut_rc.yml into version-bump.yml (#3592) 2023-12-18 10:58:37 -07:00
Vince Grassia
343cf03d3e
Update version bump workflow (#3581) 2023-12-15 13:30:36 +01:00
Daniel James Smith
f527623318
Update CODEOWNERS - Extend billing ownership (#3561)
The ToolsController is mostly used for billing related functions, so it makes sense to have @bitwarden/team-billing-dev own it.

Due to the naming-scheme, this fell under ownership of @bitwarden/team-tools-dev.
2023-12-13 14:34:36 -05:00
Joseph Flinn
e73e5f7ab4
Fix branch (#3554) 2023-12-13 05:55:46 -05:00
Joseph Flinn
c120b7e867
Point workflows to main (#3549)
* Point workflows to main

* Merge in master. Update new version-bump workflow changes
2023-12-12 20:08:12 +00:00
Vince Grassia
ab7842014a
Add token to checkout step (#3553) 2023-12-12 09:37:58 -08:00
Vince Grassia
6a6a29d881
Fix version bump workflow on call (#3551) 2023-12-12 08:53:47 -08:00
Matt Bishop
890a09804f
Stop using lockfiles (#3550) 2023-12-12 09:09:42 -05:00
Oscar Hinton
5a6a6ce4ce
Add commitMessagePrefix to package.json (#3529) 2023-12-12 13:43:11 +01:00
Vince Grassia
26e99ba000
Update Version Bump workflow (#3547)
Co-authored-by: Bitwarden DevOps <106330231+bitwarden-devops-bot@users.noreply.github.com>
2023-12-12 12:27:28 +01:00
Michał Chęciński
a589af3588
[DEVOPS-1654] Tag Server images in master with git commit (#3516)
* Add image name with SHA

* Test

* Remove testing

* Change name

* Change to short SHA

* Test

* Fix

* Remove testing

* Test

* Remove testing
2023-12-07 09:42:35 -05:00
Vince Grassia
59879f913b
Version Bump Workflow - Allow to be run from any branch (#3523) 2023-12-05 15:37:18 -05:00
Vince Grassia
721d5448b6
Fix CODEOWNERS - Add back in lines for packages and props files (#3518) 2023-12-05 10:52:16 -05:00
Oscar Hinton
cf7e0189f6
Remove tech-leads as default codeowner (#3479) 2023-12-05 09:56:25 -05:00
Matt Bishop
f424cc09f7
Revert "Remove .NET SDK constraint for Renovate (#3488)" (#3511)
This reverts commit 21f91b7043.
2023-12-04 15:34:47 -05:00
Matt Bishop
21f91b7043
Remove .NET SDK constraint for Renovate (#3488) 2023-12-04 15:25:51 -05:00
Conner Turnbull
6e4a057d55
Updated CODEOWNERS to catch billing related files for payments, invoices, and org license (#3503) 2023-12-01 12:46:53 -05:00
Oscar Hinton
a2eadfd9be
Split up Renovate dotnet monorepo group (#3481) 2023-11-30 16:46:21 +01:00
Matt Bishop
f78998125a
Lock SDK to 6.0.100 and ignore with Renovate updates (#3478) 2023-11-27 12:52:01 -05:00
Matt Bishop
4cf2142b68
Add DbOps for database changes (#3420) 2023-11-09 10:39:04 -05:00
Vince Grassia
6aa763a854
Update 'master' to 'main' (#3427) 2023-11-08 13:08:15 -05:00
Vince Grassia
f29d3e79a5
Pin gh-actions hashes to master (#3419) 2023-11-07 13:16:12 -07:00
Oscar Hinton
e317833904
[PM-2331] Update renovate with team groupings (#3384) 2023-11-03 17:02:14 +01:00
Thomas Rittson
da4a86c643
[AC-1373] Flexible Collections (#3245)
* [AC-1117] Add manage permission (#3126)

* Update sql files to add Manage permission

* Add migration script

* Rename collection manage migration file to remove duplicate migration date

* Migrations

* Add manage to models

* Add manage to repository

* Add constraint to Manage columns

* Migration lint fixes

* Add manage to OrganizationUserUserDetails_ReadWithCollectionsById

* Add missing manage fields

* Add 'Manage' to UserCollectionDetails

* Use CREATE OR ALTER where possible

* [AC-1374] Limit collection creation/deletion to Owner/Admin (#3145)

* feat: update org table with new column, write migration, refs AC-1374

* feat: update views with new column, refs AC-1374

* feat: Alter sprocs (org create/update) to include new column, refs AC-1374

* feat: update entity/data/request/response models to handle new column, refs AC-1374

* feat: update necessary Provider related views during migration, refs AC-1374

* fix: update org create to default new column to false, refs AC-1374

* feat: added new API/request model for collection management and removed property from update request model, refs AC-1374

* fix: renamed migration script to be after secrets manage beta column changes, refs AC-1374

* fix: dotnet format, refs AC-1374

* feat: add ef migrations to reflect mssql changes, refs AC-1374

* fix: dotnet format, refs AC-1374

* feat: update API signature to accept Guid and explain Cd verbiage, refs AC-1374

* fix: merge conflict resolution

* [AC-1174] CollectionUser and CollectionGroup authorization handlers (#3194)

* [AC-1174] Introduce BulkAuthorizationHandler.cs

* [AC-1174] Introduce CollectionUserAuthorizationHandler

* [AC-1174] Add CreateForNewCollection CollectionUser requirement

* [AC-1174] Add some more details to CollectionCustomization

* [AC-1174] Formatting

* [AC-1174] Add CollectionGroupOperation.cs

* [AC-1174] Introduce CollectionGroupAuthorizationHandler.cs

* [AC-1174] Cleanup CollectionFixture customization

Implement and use re-usable extension method to support seeded Guids

* [AC-1174] Introduce WithValueFromList AutoFixtureExtensions

Modify CollectionCustomization to use multiple organization Ids for auto generated test data

* [AC-1174] Simplify CollectionUserAuthorizationHandler.cs

Modify the authorization handler to only perform authorization logic. Validation logic will need to be handled by any calling commands/controllers instead.

* [AC-1174] Introduce shared CollectionAccessAuthorizationHandlerBase

A shared base authorization handler was created for both CollectionUser and CollectionGroup resources, as they share the same underlying management authorization logic.

* [AC-1174] Update CollectionUserAuthorizationHandler and CollectionGroupAuthorizationHandler to use the new CollectionAccessAuthorizationHandlerBase class

* [AC-1174] Formatting

* [AC-1174] Cleanup typo and redundant ToList() call

* [AC-1174] Add check for provider users

* [AC-1174] Reduce nested loops

* [AC-1174] Introduce ICollectionAccess.cs

* [AC-1174] Remove individual CollectionGroup and CollectionUser auth handlers and use base class instead

* [AC-1174] Tweak unit test to fail minimally

* [AC-1174] Reorganize authorization handlers in Core project

* [AC-1174] Introduce new AddCoreAuthorizationHandlers() extension method

* [AC-1174] Move CollectionAccessAuthorizationHandler into Api project

* [AC-1174] Move CollectionFixture to Vault folder

* [AC-1174] Rename operation to CreateUpdateDelete

* [AC-1174] Require single organization for collection access authorization handler

- Add requirement that all target collections must belong to the same organization
- Simplify logic related to multiple organizations
- Update tests and helpers
- Use ToHashSet to improve lookup time

* [AC-1174] Fix null reference exception

* [AC-1174] Throw bad request exception when collections belong to different organizations

* [AC-1174] Switch to CollectionAuthorizationHandler instead of CollectionAccessAuthorizationHandler to reduce complexity

* Fix improper merge conflict resolution

* fix: add permission check for collection management api, refs AC-1647 (#3252)

* [AC-1125] Enforce org setting for creating/deleting collections (#3241)

* [AC-1117] Add manage permission (#3126)

* Update sql files to add Manage permission

* Add migration script

* Rename collection manage migration file to remove duplicate migration date

* Migrations

* Add manage to models

* Add manage to repository

* Add constraint to Manage columns

* Migration lint fixes

* Add manage to OrganizationUserUserDetails_ReadWithCollectionsById

* Add missing manage fields

* Add 'Manage' to UserCollectionDetails

* Use CREATE OR ALTER where possible

* [AC-1374] Limit collection creation/deletion to Owner/Admin (#3145)

* feat: update org table with new column, write migration, refs AC-1374

* feat: update views with new column, refs AC-1374

* feat: Alter sprocs (org create/update) to include new column, refs AC-1374

* feat: update entity/data/request/response models to handle new column, refs AC-1374

* feat: update necessary Provider related views during migration, refs AC-1374

* fix: update org create to default new column to false, refs AC-1374

* feat: added new API/request model for collection management and removed property from update request model, refs AC-1374

* fix: renamed migration script to be after secrets manage beta column changes, refs AC-1374

* fix: dotnet format, refs AC-1374

* feat: add ef migrations to reflect mssql changes, refs AC-1374

* fix: dotnet format, refs AC-1374

* feat: update API signature to accept Guid and explain Cd verbiage, refs AC-1374

* feat: created collection auth handler/operations, added LimitCollectionCdOwnerAdmin to CurrentContentOrganization, refs AC-1125

* feat: create vault service collection extensions and register with base services, refs AC-1125

* feat: deprecated CurrentContext.CreateNewCollections, refs AC-1125

* feat: deprecate DeleteAnyCollection for single resource usages, refs AC-1125

* feat: move service registration to api, update references, refs AC-1125

* feat: add bulk delete authorization handler, refs AC-1125

* feat: always assign user and give manage access on create, refs AC-1125

* fix: updated CurrentContextOrganization type, refs AC-1125

* feat: combined existing collection authorization handlers/operations, refs AC-1125

* fix: OrganizationServiceTests -> CurrentContentOrganization typo, refs AC-1125

* fix: format, refs AC-1125

* fix: update collection controller tests, refs AC-1125

* fix: dotnet format, refs AC-1125

* feat: removed extra BulkAuthorizationHandler, refs AC-1125

* fix: dotnet format, refs AC-1125

* fix: change string to guid for org id, update bulk delete request model, refs AC-1125

* fix: remove delete many collection check, refs AC-1125

* fix: clean up collection auth handler, refs AC-1125

* fix: format fix for CollectionOperations, refs AC-1125

* fix: removed unnecessary owner check, add org null check to custom permission validation, refs AC-1125

* fix: remove unused methods in CurrentContext, refs AC-1125

* fix: removed obsolete test, fixed failling delete many test, refs AC-1125

* fix: CollectionAuthorizationHandlerTests fixes, refs AC-1125

* fix: OrganizationServiceTests fix broken test by mocking GetOrganization, refs AC-1125

* fix: CollectionAuthorizationHandler - remove unused repository, refs AC-1125

* feat: moved UserId null check to common method, refs AC-1125

* fix: updated auth handler tests to remove dependency on requirement for common code checks, refs AC-1125

* feat: updated conditionals/comments for create/delete methods within colleciton auth handler, refs AC-1125

* feat: added create/delete collection auth handler success methods, refs AC-1125

* fix: new up permissions to prevent excessive null checks, refs AC-1125

* fix: remove old reference to CreateNewCollections, refs AC-1125

* fix: typo within ViewAssignedCollections method, refs AC-1125

---------

Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>

* refactor: remove organizationId from CollectionBulkDeleteRequestModel, refs AC-1649 (#3282)

* [AC-1174] Bulk Collection Management (#3229)

* [AC-1174] Update SelectionReadOnlyRequestModel to use Guid for Id property

* [AC-1174] Introduce initial bulk-access collection endpoint

* [AC-1174] Introduce BulkAddCollectionAccessCommand and validation logic/tests

* [AC-1174] Add CreateOrUpdateAccessMany method to CollectionRepository

* [AC-1174] Add event logs for bulk add collection access command

* [AC-1174] Add User_BumpAccountRevisionDateByCollectionIds and database migration script

* [AC-1174] Implement EF repository method

* [AC-1174] Improve null checks

* [AC-1174] Remove unnecessary BulkCollectionAccessRequestModel helpers

* [AC-1174] Add unit tests for new controller endpoint

* [AC-1174] Fix formatting

* [AC-1174] Remove comment

* [AC-1174] Remove redundant organizationId parameter

* [AC-1174] Ensure user and group Ids are distinct

* [AC-1174] Cleanup tests based on PR feedback

* [AC-1174] Formatting

* [AC-1174] Update CollectionGroup alias in the sproc

* [AC-1174] Add some additional comments to SQL sproc

* [AC-1174] Add comment explaining additional SaveChangesAsync call

---------

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>

* [AC-1646] Rename LimitCollectionCdOwnerAdmin column (#3300)

* Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion

* Rename and bump migration script

* [AC-1666] Removed EditAnyCollection from Create/Delete permission checks (#3301)

* fix: remove EditAnyCollection from Create/Delete permission check, refs AC-1666

* fix: updated comment, refs AC-1666

* [AC-1669] Bug - Remove obsolete assignUserId from CollectionService.SaveAsync(...) (#3312)

* fix: remove AssignUserId from CollectionService.SaveAsync, refs AC-1669

* fix: add manage access conditional before creating collection, refs AC-1669

* fix: move access logic for create/update, fix all tests, refs AC-1669

* fix: add CollectionAccessSelection fixture, update tests, update bad reqeuest message, refs AC-1669

* fix: format, refs AC-1669

* fix: update null params with specific arg.is null checks, refs Ac-1669

* fix: update attribute class name, refs AC-1669

* [AC-1713] [Flexible collections] Add feature flags to server (#3334)

* Add feature flags for FlexibleCollections and BulkCollectionAccess

* Flag new routes and behaviour

---------

Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>

* Add joint codeownership for auth handlers (#3346)

* [AC-1717] Update default values for LimitCollectionCreationDeletion (#3365)

* Change default value in organization create sproc to 1

* Drop old column name still present in some QA instances

* Set LimitCollectionCreationDeletion value in code based on feature flag

* Fix: add missing namespace after merging in master

* Fix: add missing namespace after merging in master

* [AC-1683] Fix DB migrations for new Manage permission (#3307)

* [AC-1683] Update migration script and introduce V2 procedures and types

* [AC-1683] Update repository calls to use new V2 procedures / types

* [AC-1684] Update bulk add collection migration script to use new V2 type

* [AC-1683] Undo Manage changes to more original procedures

* [AC-1683] Restore whitespace changes

* [AC-1683] Clarify comments regarding explicit column lists

* [AC-1683] Update migration script dates

* [AC-1683] Split the migration script for readability

* [AC-1683] Re-name SelectReadOnlyArray_V2 to CollectionAccessSelectionType

* [AC-1648] [Flexible Collections] Bump migration scripts before feature branch merge (#3371)

* Bump dates on sql migration scripts

* Bump date on ef migrations

---------

Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>
Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com>
Co-authored-by: Shane Melton <smelton@bitwarden.com>
Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
2023-11-01 09:30:52 +00:00
Vince Grassia
96decdb9ba
Add Directory.Build.props to CODEOWNERS (#3395) 2023-10-31 09:27:37 -04:00
Vince Grassia
bf815484ed
Update CODEOWNERS for packages.lock.json (#3393) 2023-10-31 09:19:43 -04:00
Thomas Rittson
15268db4be
Add Billing folders to code ownership (#3390) 2023-10-31 08:13:53 -04:00
renovate[bot]
1c0c6cc879
Update bitwarden/gh-actions digest to c970b0f (#3332)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-18 12:22:12 -04:00
Michał Chęciński
f7349b4ff2
Enable MsSqlMigratorUtility Dockerfile to run with additional parameters (#3348) 2023-10-18 09:40:49 -04:00
Michał Chęciński
eec2763e78
Automate Lock File Generation (#3345) 2023-10-16 16:33:29 +02:00
Daniel James Smith
3a71e7b081
Add tech-leads as default owners (#3330)
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
2023-10-06 18:28:02 +02:00
renovate[bot]
4dcd467a5f
Update crazy-max/ghaction-import-gpg action to v6 (#3315)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 14:59:23 -04:00
renovate[bot]
8c3ca2f1fa
Update bitwarden/gh-actions digest to f112580 (#3314)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 14:58:13 -04:00
Conner Turnbull
cc68d84301
Added billing patterns to codeowners (#3322) 2023-10-04 12:05:44 -04:00
renovate[bot]
464dac8f4d
Update bitwarden/gh-actions digest to fdcf1fc (#3230)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-26 10:30:28 -04:00
renovate[bot]
e3dc515062
Update actions/checkout action to v4.1.0 (#3293)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 08:34:54 -04:00
renovate[bot]
4100372401
Update actions/checkout action to v4 (#3257)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-18 10:47:07 -04:00
renovate[bot]
876274b39e
Update gh minor (#3077)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-18 10:39:38 -04:00
Joseph Flinn
6d078851dc
Devops 1539 optimize server build (#3237)
* Switch server build back to only triggering the Unified and relying on Slack notifications to notify of a failure

* Run actionlint over workflow files

* pin actions/github-script hash
2023-08-29 16:22:09 -06:00
Alex Urbina
68e1a3f431
DEVOPS-1409 REFACTOR: bitwarden/gh-actions/download-artifacts to use version that uses node16 (#3223) 2023-08-23 08:05:15 -06:00
Matt Bishop
6374cc6f0c
Force Renovate to use v6 .NET SDK (#3220) 2023-08-22 11:46:06 -04:00
Opeyemi
e0299043a2
UPDATE: dotnet setup run step and to use global version (#3182)
* UPDATE: dotnet setup run step and to use global version

* TEST: make the build run

* Revert attachment base image to latest
2023-08-14 16:40:27 +01:00
Opeyemi
0487056afb
[DEVOPS-1517] - Update Server release to pull from Prod ACR (#3169)
* UPDATE: Server release to pull from Prod ACR

* UPDATE: condition for DCT setup

* UPDATE: attachment Dockerfile to reference server latest

* REMOVE: push Server image to DockerHub

* FIX: lint error

* Minor changes
2023-08-14 15:56:54 +01:00
Opeyemi
9d4b98e787
FIX: add more dotnet setup (#3181)
* UPDATE: move dotnet setup to run before checkout
2023-08-11 14:54:40 +01:00
Matt Bishop
6785908e39
Explicitly install .NET SDK for linting (#3180) 2023-08-11 08:49:04 -04:00
MtnBurrit0
d5a0e97fea
Fix github.ref comparison in build.yml (#3177)
+ Convert to case statement
+ Extend comment
2023-08-10 14:49:39 -06:00
Opeyemi
0c76969506
[DEVOPS-1516] - Update server build workflow to push images to ACR (#3157)
* Update server build workflow to push images to ACR

* UPDATE: Remove docker_repos matrix variable

* FIX: make docker push command one-liner

* UODATE: revert attachment image source

* UPDATE: add suggestion and update tags in docker build

* UPDATE: docker build tags

* UPDATE: master branch tag to latest

* ADD: push server image to dockerhub

* ADD: sugesstions

* ADD: ACR var name change and usages

* Minor updates

* Fix syntax error

* UPDATE: use ACR var for image name step

---------

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
2023-08-10 18:41:56 +01:00
Oscar Hinton
d4bcaf10ff
Remove moq (#3166) 2023-08-10 17:03:42 +02:00