-
-
Notifications
You must be signed in to change notification settings - Fork 622
fixed Private key and certificates on repo #3666
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
Merged
mpilquist
merged 14 commits into
typelevel:main
from
guptapratykshh:fix/ephemeral-certificates-issue-3611
Jan 28, 2026
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
00b9144
Generate ephemeral certificates for TLS tests (#3611)
guptapratykshh 4ec077f
refactor(tls): unifiy certificate generation and fix caching logic
guptapratykshh d7ae073
simplify to self-signed cert and fix strict validation
guptapratykshh fa569f9
Merge branch 'main' into fix/ephemeral-certificates-issue-3611
guptapratykshh ac89706
Retry key generation if low entropy is cause of failure
mpilquist a81cb22
Sleep between retries
mpilquist 16ab557
Add an entropy daemon on GHA
mpilquist 4201128
Change randfile to /dev/urandom
mpilquist f3569f0
Try passing -rand to openssl instead
mpilquist 78f041c
Try using a config file to avoid supposed crashes with addext
mpilquist 542c217
Replace AtomicCell with Mutex+Ref to simplify
mpilquist 44f9baa
Remove redundant encoding of PEM
mpilquist eb43bae
Scalafmt
mpilquist 750571b
Remove unnecessary sleep from JS TLSSuite
mpilquist File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright (c) 2013 Functional Streams for Scala | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| * this software and associated documentation files (the "Software"), to deal in | ||
| * the Software without restriction, including without limitation the rights to | ||
| * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| * the Software, and to permit persons to whom the Software is furnished to do so, | ||
| * subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| package fs2.io | ||
|
|
||
| import cats.effect.IO | ||
| import fs2.io.file.Files | ||
| import scodec.bits.ByteVector | ||
| import scala.concurrent.duration._ | ||
|
|
||
| /** Platform-specific implementation for JS platform using OpenSSL. | ||
| */ | ||
| private[io] object PlatformSpecificCertificateProvider { | ||
|
|
||
| def create: IO[TestCertificateProvider] = IO.pure(new JsCertificateProvider) | ||
|
|
||
| private class JsCertificateProvider extends TestCertificateProvider { | ||
|
|
||
| def getCertificatePair: IO[TestCertificateProvider.CertificatePair] = | ||
| Files[IO].tempDirectory.use { tempDir => | ||
| val certPath = tempDir / "cert.pem" | ||
| val keyPath = tempDir / "key.pem" | ||
|
|
||
| val cmd = List( | ||
| "openssl", | ||
| "req", | ||
| "-x509", | ||
| "-newkey", | ||
| "rsa:2048", | ||
| "-keyout", | ||
| keyPath.toString, | ||
| "-out", | ||
| certPath.toString, | ||
| "-days", | ||
| "365", | ||
| "-nodes", | ||
| "-subj", | ||
| "/CN=localhost/O=FS2 Tests", | ||
| "-addext", | ||
| "subjectAltName=DNS:localhost,IP:127.0.0.1", | ||
| "-sha256" | ||
| ) | ||
|
|
||
| def run(cmd: List[String]): IO[Unit] = | ||
| fs2.io.process.ProcessBuilder(cmd.head, cmd.tail: _*).spawn[IO].use { p => | ||
| p.exitValue.flatMap { | ||
| case 0 => IO.unit | ||
| case n => | ||
| IO.raiseError(new RuntimeException(s"Command ${cmd.head} failed with exit code $n")) | ||
| } | ||
| } | ||
|
|
||
| for { | ||
| _ <- run(cmd) | ||
| _ <- IO.sleep(1.second) | ||
| cert <- Files[IO].readAll(certPath).compile.to(ByteVector) | ||
| key <- Files[IO].readAll(keyPath).compile.to(ByteVector) | ||
| certString <- Files[IO].readAll(certPath).through(fs2.text.utf8.decode).compile.string | ||
| keyString <- Files[IO].readAll(keyPath).through(fs2.text.utf8.decode).compile.string | ||
| } yield TestCertificateProvider.CertificatePair( | ||
| certificate = cert, | ||
| privateKey = key, | ||
| certificateString = certString, | ||
| privateKeyString = keyString | ||
| ) | ||
| } | ||
| } | ||
| } |
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
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
94 changes: 94 additions & 0 deletions
94
io/jvm/src/test/scala/fs2/io/JvmJsCertificateProvider.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Copyright (c) 2013 Functional Streams for Scala | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| * this software and associated documentation files (the "Software"), to deal in | ||
| * the Software without restriction, including without limitation the rights to | ||
| * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| * the Software, and to permit persons to whom the Software is furnished to do so, | ||
| * subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| package fs2.io | ||
|
|
||
| import cats.effect.IO | ||
| import fs2.io.file.Files | ||
| import scodec.bits.ByteVector | ||
| import scala.concurrent.duration._ | ||
|
|
||
| /** Platform-specific implementation for JVM platform using OpenSSL. | ||
| */ | ||
| private[io] object PlatformSpecificCertificateProvider { | ||
|
|
||
| def create: IO[TestCertificateProvider] = IO.pure(new JvmCertificateProvider) | ||
|
|
||
| private class JvmCertificateProvider extends TestCertificateProvider { | ||
|
|
||
| def getCertificatePair: IO[TestCertificateProvider.CertificatePair] = | ||
| Files[IO].tempDirectory.use { tempDir => | ||
| val certPath = tempDir / "cert.pem" | ||
| val keyPath = tempDir / "key.pem" | ||
|
|
||
| val cmd = List( | ||
| "openssl", | ||
| "req", | ||
| "-x509", | ||
| "-newkey", | ||
| "rsa:2048", | ||
| "-keyout", | ||
| keyPath.toString, | ||
| "-out", | ||
| certPath.toString, | ||
| "-days", | ||
| "365", | ||
| "-nodes", | ||
| "-subj", | ||
| "/CN=localhost/O=FS2 Tests", | ||
| "-addext", | ||
| "subjectAltName=DNS:localhost,IP:127.0.0.1", | ||
| "-sha256" | ||
| ) | ||
|
|
||
| def run(cmd: List[String]): IO[Unit] = | ||
| fs2.io.process.ProcessBuilder(cmd.head, cmd.tail: _*).spawn[IO].use { p => | ||
| for { | ||
| out <- p.stdout.through(fs2.text.utf8.decode).compile.string | ||
| err <- p.stderr.through(fs2.text.utf8.decode).compile.string | ||
| exitCode <- p.exitValue | ||
| _ <- | ||
| if (exitCode == 0) IO.unit | ||
| else | ||
| IO.raiseError( | ||
| new RuntimeException( | ||
| s"Command ${cmd.mkString(" ")} failed with exit code $exitCode\nStdout: $out\nStderr: $err" | ||
| ) | ||
| ) | ||
| } yield () | ||
| } | ||
|
|
||
| for { | ||
| _ <- run(cmd) | ||
| _ <- IO.sleep(1.second) | ||
| cert <- Files[IO].readAll(certPath).compile.to(ByteVector) | ||
| key <- Files[IO].readAll(keyPath).compile.to(ByteVector) | ||
| certString <- Files[IO].readAll(certPath).through(fs2.text.utf8.decode).compile.string | ||
| keyString <- Files[IO].readAll(keyPath).through(fs2.text.utf8.decode).compile.string | ||
| } yield TestCertificateProvider.CertificatePair( | ||
| certificate = cert, | ||
| privateKey = key, | ||
| certificateString = certString, | ||
| privateKeyString = keyString | ||
| ) | ||
| } | ||
| } | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note this file is JVM specific but name still has Js in it.