Skip to content

Use type safe method to get secret and instanceid - #35587

Closed
J0WI wants to merge 3 commits into
nextcloud:masterfrom
J0WI:get.secret
Closed

Use type safe method to get secret and instanceid#35587
J0WI wants to merge 3 commits into
nextcloud:masterfrom
J0WI:get.secret

Conversation

@J0WI

@J0WIJ0WI commented Dec 4, 2022

Copy link
Copy Markdown
Contributor

Summary

Getting rid off some more getSystemValue(), see ##35581 for context.

Checklist

@J0WI
J0WI requested a review from CarlSchwan as a code ownerDecember 4, 2022 15:43
@J0WIJ0WI added the 3. to review Waiting for reviews label Dec 4, 2022
@szaimenszaimen added this to the Nextcloud 26 milestone Dec 4, 2022
@szaimen
szaimen requested review from a team, ArtificialOwl and blizzz and removed request for a teamDecember 4, 2022 15:49
Comment threadapps/settings/lib/Mailer/NewUserMailHelper.php Fixed
Comment threadcore/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php Outdated
Comment threadlib/private/Repair/MoveUpdaterStepFile.php

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI needs #35580, but there might be some tests needing adjustments (didn't check)

@J0WI

J0WI commented Dec 5, 2022

Copy link
Copy Markdown
ContributorAuthor

still some failures in https://drone.nextcloud.com/nextcloud/server/26953/9/4 😕

Comment threadapps/settings/lib/Mailer/NewUserMailHelper.php Outdated
@szaimen

Copy link
Copy Markdown
Contributor

/rebase

@PVince81

Copy link
Copy Markdown
Member

@J0WI can you rebase? the bot can't rebase on forks

@PVince81PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 11, 2023
@come-nc

Copy link
Copy Markdown
Contributor

Failed tests are worrying, cypress is failing and drone nodb has:

There was 1 error:
239 240	1) Test\Security\VerificationToken\VerificationTokenTest::testTokenSuccess
241	OCP\Security\VerificationToken\InvalidTokenException: 242 243	/drone/src/lib/private/Security/VerificationToken/VerificationToken.php:71
244	/drone/src/lib/private/Security/VerificationToken/VerificationToken.php:91
245	/drone/src/tests/lib/Security/VerificationToken/VerificationTokenTest.php:290

@blizzzblizzz mentioned this pull request Feb 1, 2023
@skjnldsvskjnldsv mentioned this pull request Feb 23, 2023
@blizzzblizzz mentioned this pull request Mar 7, 2023
@blizzzblizzz modified the milestones: Nextcloud 26, Nextcloud 27Mar 9, 2023
@szaimen
szaimen enabled auto-merge April 17, 2023 13:42
@szaimen

Copy link
Copy Markdown
Contributor

@J0WI nodb failure seems to be related. Also can you please fix the conflicts? Thanks a lot! :)

@szaimenszaimen added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Apr 25, 2023
@come-nc

Copy link
Copy Markdown
Contributor
There was 1 error:
227 228	1) Test\Security\IdentityProof\ManagerTest::testGetSystemKeyFailure
229	PHPUnit\Framework\MockObject\IncompatibleReturnValueException: Method getSystemValueString may not return value of type NULL, its declared return type is "string"
230 231	/drone/src/tests/lib/Security/IdentityProof/ManagerTest.php:233
314	There were 2 failures:
315 316	1) Tests\Core\Data\LoginFlowV2ServiceUnitTest::testCreateTokens
317	Expectation failed for method name is "getSystemValue" when invoked 2 time(s).
318	Method was expected to be called 2 times, actually called 1 times.
319 320	2) OCA\Settings\Tests\Mailer\NewUserMailHelperTest::testGenerateTemplateWithPasswordResetToken
321	Expectation failed for method name is "encrypt" when invoked 1 time(s)
322	Parameter 1 for invocation OCP\Security\ICrypto::encrypt('12345:MySuperLongSecureRandomToken', 'recipient@example.com'): string does not match expected value.
323	Failed asserting that two strings are equal.
324	--- Expected
325	+++ Actual
326	@@ @@
327	-'recipient@example.comMyInstanceWideSecret'
328	+'recipient@example.com'
329 330	/drone/src/apps/settings/lib/Mailer/NewUserMailHelper.php:112
331	/drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:380

This was referenced May 3, 2023
@blizzzblizzz mentioned this pull request May 17, 2023
@blizzzblizzz modified the milestones: Nextcloud 27, Nextcloud 28May 23, 2023
@skjnldsvskjnldsv mentioned this pull request Nov 1, 2023
This was referenced Nov 6, 2023
This was referenced Nov 14, 2023
@blizzzblizzz modified the milestones: Nextcloud 28, Nextcloud 29Nov 23, 2023
This was referenced Mar 12, 2024
This was referenced Mar 20, 2024
@skjnldsvskjnldsv mentioned this pull request Mar 28, 2024
81 tasks
This was referenced Jul 30, 2024
This was referenced Aug 5, 2024
@skjnldsvskjnldsv mentioned this pull request Aug 13, 2024
auto-merge was automatically disabled August 14, 2024 10:17

Pull request was closed

@skjnldsvskjnldsv removed this from the Nextcloud 30 milestone Aug 14, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2. developingWork in progress

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@J0WI@szaimen@PVince81@come-nc@blizzz@github-advanced-security@skjnldsv