Merge 0.22 -> 0.23 #6178
Merged
Merge 0.22 -> 0.23 #6178
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
Don't override api url
Co-authored-by: Arman Bilge <armanbilge@gmail.com>
Resolves http4s#6068 NonceKeeper is package-private, so there's no way to construct one, meaning there's no way to call `challenge`. Mirror the same parameters from `apply`, and maintain the previous `challenge` method for bincompat.
…ion/DigestAuth.scala Co-authored-by: Arman Bilge <armanbilge@gmail.com>
In order to achieve the goal of F.delay(new NonceKeeper) but maintaining the original intent of `apply`, just revert everything in this PR, make the original (unusable) `challenge` `private`, and create a new public `challenge` with the necessary parameters, intended for human use, without impacting the existing flow.
…ion/DigestAuth.scala Co-authored-by: Arman Bilge <armanbilge@gmail.com>
Internals unchanged, in preparation for a pure rewrite of DigestAuth. Includes a private bincompat method
Internals unchanged, in preparation for a pure rewrite of DigestAuth. Includes a private bincompat method
rossabaker
commented
Mar 24, 2022
server/shared/src/main/scala/org/http4s/server/middleware/authentication/NonceF.scala
Outdated
Show resolved
Hide resolved
|
Whoopsies: typelevel/cats-effect#2902 |
danicheg
reviewed
Mar 24, 2022
server/shared/src/main/scala/org/http4s/server/middleware/authentication/Nonce.scala
Outdated
Show resolved
Hide resolved
…ion/Nonce.scala Co-authored-by: Daniel Esik <e.danicheg@yandex.ru>
…entication/Nonce.scala Co-authored-by: Daniel Esik <e.danicheg@yandex.ru>
…ladoc Clean up `BlazeServerBuilder` scaladoc
armanbilge
reviewed
Mar 24, 2022
| current <- F.monotonic | ||
| lastCleanupMillis <- Ref[F].of(current) | ||
| nonces = new LinkedHashMap[String, NonceF[F]] | ||
| random <- Random.javaSecuritySecureRandom[F] |
There was a problem hiding this comment.
I see in CE3 this is implemented as:
def javaSecuritySecureRandom[F[_]: Sync]: F[Random[F]] =
Sync[F].delay(new java.security.SecureRandom).flatMap(r => javaUtilRandom(r))We can do the same thing and unblock JS:
def javaSecuritySecureRandom[F[_]: Sync]: F[Random[F]] =
Sync[F].delay(new org.http4s.crypto.unsafe.SecureRandom).flatMap(r => javaUtilRandom(r))There was a problem hiding this comment.
This is now fixed in CE, so we can revert.
There was a problem hiding this comment.
Oops. I didn't remember making 6753dd0 part of this. But it's a tight spot either way:
- If we do it, we want a consensus on
cats.effect.std.SecureRandombefore we release. - If we don't do it, we can't easily introduce
Randomto the API later without another crap overload.
There was a problem hiding this comment.
I'm going to prune that commit because there's a discussion of it on another draft.
Integrate Random into DigestAuth
danicheg
reviewed
Mar 25, 2022
| @@ -329,4 +330,13 @@ package object internal { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| private[http4s] def javaMajorVersion[F[_]](implicit F: Sync[F]): F[Option[Int]] = | |||
There was a problem hiding this comment.
This seems unused. Do we want this within 0.23?
There was a problem hiding this comment.
it's used in 0.22. Something like it will need to be in Cats-Effect if we fix its Random. I left it mainly because I don't want to write it again if we ever need it, but it wasn't hard. I guess we can prune it.
danicheg
approved these changes
Mar 25, 2022
rossabaker
added a commit
to http4s/http4s-servlet
that referenced
this pull request
Apr 3, 2022
…-03-23 Merge 0.22 -> 0.23
rossabaker
added a commit
to http4s/blaze
that referenced
this pull request
May 26, 2022
…-03-23 Merge 0.22 -> 0.23
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.
The heavy lift on this one is getting the new DigestAuth to CE3.
It still has the blocking Random embedded. We'll need to adjust this further in light of #6177.