forked from nextcloud/server
-
Notifications
You must be signed in to change notification settings - Fork 0
fix(admin-delegation): Prevent delegation to group if delegation alre… #145
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
printminion-co
wants to merge
111
commits into
master
Choose a base branch
from
fix/no_double_admin_delegations
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Josh <[email protected]>
Signed-off-by: Josh <[email protected]>
Bumps [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher) from 6.4.25 to 7.3.3. - [Release notes](https://github.com/symfony/event-dispatcher/releases) - [Changelog](https://github.com/symfony/event-dispatcher/blob/7.3/CHANGELOG.md) - [Commits](symfony/event-dispatcher@v6.4.25...v7.3.3) --- updated-dependencies: - dependency-name: symfony/event-dispatcher dependency-version: 7.3.3 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Richard Steinmetz <[email protected]>
When computing the unencrypted file size, we need the size of the last encrypted chunk as its size is usually not the regular 8192 bits. To avoid reading the whole file, we seek directly to that last chunk based on the expected file size. When the expected file size is smaller than the actual one, we have a logic in place to continue reading until we reach the end of the file. In that logic, we forgot to increment the `$lastChunkNr` which is important when we later check the signature of the chunk. This commit adds that missing increment. Signed-off-by: Louis Chmn <[email protected]>
This can happen in various scenarios, we should allow the user to delete the share in this situation. Signed-off-by: Côme Chilliet <[email protected]>
Co-authored-by: Kate <[email protected]> Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Bumps the vitest group with 2 updates in the /build/frontend-legacy directory: [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8) and [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest). Updates `@vitest/coverage-v8` from 3.2.4 to 4.0.13 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.0.13/packages/coverage-v8) Updates `vitest` from 3.2.4 to 4.0.13 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.0.13/packages/vitest) --- updated-dependencies: - dependency-name: "@vitest/coverage-v8" dependency-version: 4.0.13 dependency-type: direct:development update-type: version-update:semver-major dependency-group: vitest - dependency-name: vitest dependency-version: 4.0.13 dependency-type: direct:development update-type: version-update:semver-major dependency-group: vitest ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [behat/behat](https://github.com/Behat/Behat) from 3.26.0 to 3.27.0. - [Release notes](https://github.com/Behat/Behat/releases) - [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md) - [Commits](Behat/Behat@v3.26.0...v3.27.0) --- updated-dependencies: - dependency-name: behat/behat dependency-version: 3.27.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
8cd9c11 to
74a6b24
Compare
When `show_federated_shares_to_trusted_servers_as_internal` is enabled, lookup server results were being filtered out because they lacked the `isTrustedServer` flag. This adds the flag to lookup results by: - Injecting TrustedServers service into LookupPlugin - Adding `server` and `isTrustedServer` fields to each lookup result - Updating tests to reflect new structure This ensures lookup results from trusted servers appear in internal sharing while non-trusted servers are correctly filtered out. Signed-off-by: nfebe <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
…/build/integration/symfony/event-dispatcher-7.3.3 build(deps-dev): bump symfony/event-dispatcher from 6.4.25 to 7.3.3 in /build/integration
…server-filter fix(sharing): Add isTrustedServer flag to lookup results
…ion/increment_lastChunkNr fix(encryption): Increment `lastChunkNr` when size is off
…yarn/build/frontend-legacy/vitest-05d30e5828 build(deps-dev): bump the vitest group across 1 directory with 2 updates
Bumps the vite group with 1 update in the /build/frontend-legacy directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 7.2.2 to 7.2.4 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v7.2.4/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 7.2.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: vite ... Signed-off-by: dependabot[bot] <[email protected]>
…oken-shares fix(files_sharing): Allow deleting a share of a missing file
Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
…yarn/build/frontend-legacy/vite-939f50a5f3 build(deps-dev): bump vite from 7.2.2 to 7.2.4 in /build/frontend-legacy in the vite group across 1 directory
ci: update workflows from organization
Not needed anymore after the vue migration Signed-off-by: Louis Chmn <[email protected]>
Signed-off-by: Louis Chmn <[email protected]>
Signed-off-by: Louis Chmn <[email protected]>
…yarn/vitest-b8deea5be8 build(deps-dev): bump the vitest group across 2 directories with 2 updates
Signed-off-by: nextcloud-command <[email protected]>
…yarn/build/frontend-legacy/marked-17.0.1 build(deps): bump marked from 17.0.0 to 17.0.1 in /build/frontend-legacy
Signed-off-by: Nextcloud bot <[email protected]>
…yarn/build/frontend-legacy/camelcase-9.0.0 build(deps): bump camelcase from 8.0.0 to 9.0.0 in /build/frontend-legacy
Bumps [vue](https://github.com/vuejs/core) from 3.5.24 to 3.5.25. - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](vuejs/core@v3.5.24...v3.5.25) --- updated-dependencies: - dependency-name: vue dependency-version: 3.5.25 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
…yarn/build/frontend-legacy/nextcloud/webpack-vue-config-7.0.2 build(deps-dev): bump @nextcloud/webpack-vue-config from 7.0.1 to 7.0.2 in /build/frontend-legacy
…yarn/vue-3.5.25 build(deps): bump vue from 3.5.24 to 3.5.25
Bumps [debounce](https://github.com/sindresorhus/debounce) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/sindresorhus/debounce/releases) - [Commits](sindresorhus/debounce@v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: debounce dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
…yarn/build/frontend-legacy/debounce-3.0.0 build(deps): bump debounce from 2.2.0 to 3.0.0 in /build/frontend-legacy
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 7.3.0 to 7.4.0. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](GoogleChrome/workbox@v7.3.0...v7.4.0) --- updated-dependencies: - dependency-name: workbox-webpack-plugin dependency-version: 7.4.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
…yarn/build/frontend-legacy/workbox-webpack-plugin-7.4.0 build(deps-dev): bump workbox-webpack-plugin from 7.3.0 to 7.4.0 in /build/frontend-legacy
Signed-off-by: John Molakvoæ <[email protected]>
The dependency is only used by DAV app but that is already migrated to Vue 3. Signed-off-by: Ferdinand Thiessen <[email protected]>
Those dependencies were used only by our Cypress config, but now as we use `@nextcloud/e2e-test-server` we do not have any direct dependency on any of them. Signed-off-by: Ferdinand Thiessen <[email protected]>
…s-dependencies chore: remove `@nextcloud/calendar-availability-vue` from legacy
Signed-off-by: Maksim Sukharev <[email protected]>
chore(deps): remove unused dependencies
Signed-off-by: nextcloud-command <[email protected]>
During the initial Vue 3 migration some dependencies were forgotten to be explicitly mentioned as dependencies. This aligns those dependencies with the package.json It was only working because they were peer dependencies of other dependencies we already added. Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
build(deps): add missing dependencies
…s-busy fix(user_status): adjust online status string
…ady exist Signed-off-by: Misha M.-Kupriyanov <[email protected]>
74a6b24 to
d6116fc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…ady exist
Before
Multiple delegation to same group is possible
After fix
Fixes issue with delegation via occ and web.
No multiple entries in DB.
Checklist