Skip to content

Commit

Permalink
Merge pull request #2007 from MaciejG604/react-to-sonatype-response-c…
Browse files Browse the repository at this point in the history 
…odes

React to some HTTP responses
  • Loading branch information
@Gedochao
Gedochao authored Nov 13, 2023
2 parents d0901ba + 815c93a commit c9d3b26
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 63 deletions.
173 changes: 112 additions & 61 deletions modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import coursier.publish.signing.logger.InteractiveSignerLogger
import coursier.publish.signing.{GpgSigner, NopSigner, Signer}
import coursier.publish.sonatype.SonatypeApi
import coursier.publish.upload.logger.InteractiveUploadLogger
import coursier.publish.upload.{DummyUpload, FileUpload, HttpURLConnectionUpload}
import coursier.publish.upload.{DummyUpload, FileUpload, HttpURLConnectionUpload, Upload}
import coursier.publish.{Content, Hooks, Pom, PublishRepository}

import java.io.{File, OutputStreamWriter}
Expand Down Expand Up @@ -58,10 +58,11 @@ import scala.cli.commands.{ScalaCommand, SpecificationLevel, WatchUtil}
import scala.cli.config.{ConfigDb, Keys, PasswordOption, PublishCredentials}
import scala.cli.errors.{
FailedToSignFileError,
InvalidSonatypePublishCredentials,
MalformedChecksumsError,
MissingConfigEntryError,
MissingPublishOptionError,
UploadError
UploadError,
WrongSonatypeServerError
}
import scala.cli.packaging.Library
import scala.cli.publish.BouncycastleSignerMaker
Expand All @@ -76,12 +77,16 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
override def scalaSpecificationLevel: SpecificationLevel = SpecificationLevel.EXPERIMENTAL

import scala.cli.commands.shared.HelpGroup.*

val primaryHelpGroups: Seq[HelpGroup] = Seq(Publishing, Signing, PGP)
val hiddenHelpGroups: Seq[HelpGroup] = Seq(Scala, Java, Entrypoint, Dependency, Watch)

override def helpFormat: HelpFormat = super.helpFormat
.withHiddenGroups(hiddenHelpGroups)
.withPrimaryGroups(primaryHelpGroups)

override def group: String = HelpCommandGroup.Main.toString

override def sharedOptions(options: PublishOptions): Option[SharedOptions] =
Some(options.shared)

Expand Down Expand Up @@ -370,18 +375,22 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
"publish.organization"
))
}

private def defaultName(workspace: os.Path, logger: Logger): String = {
val name = workspace.last
logger.message(
s"Using directive publish.name not specified, using workspace directory name $name as default name"
)
name
}

def defaultComputeVersion(mayDefaultToGitTag: Boolean): Option[ComputeVersion] =
if (mayDefaultToGitTag) Some(ComputeVersion.GitTag(os.rel, dynVer = false, positions = Nil))
else None

def defaultVersionError =
new MissingPublishOptionError("version", "--project-version", "publish.version")

def defaultVersion: Either[BuildException, String] =
Left(defaultVersionError)

Expand Down Expand Up @@ -496,7 +505,8 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
case None =>
val computeVer = publishOptions.contextual(isCi).computeVersion.orElse {
def isGitRepo = GitRepo.gitRepoOpt(workspace).isDefined
val default = defaultComputeVersion(!isCi && isGitRepo)

val default = defaultComputeVersion(!isCi && isGitRepo)
if (default.isDefined)
logger.message(
s"Using directive ${defaultVersionError.directiveName} not set, assuming git:tag as publish.computeVersion"
Expand Down Expand Up @@ -757,51 +767,50 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {

val ec = builds.head.options.finalCache.ec

def authOpt(repo: String): Either[BuildException, Option[Authentication]] = either {
val isHttps = {
val uri = new URI(repo)
uri.getScheme == "https"
}
val hostOpt = Option.when(isHttps)(new URI(repo).getHost)
val maybeCredentials: Either[BuildException, Option[PublishCredentials]] = hostOpt match {
case None => Right(None)
case Some(host) =>
configDb().get(Keys.publishCredentials).wrapConfigException.map { credListOpt =>
credListOpt.flatMap { credList =>
credList.find { cred =>
cred.host == host &&
(isHttps || cred.httpsOnly.contains(false))
def authOpt(repo: String, isSonatype: Boolean): Either[BuildException, Option[Authentication]] =
either {
val isHttps = {
val uri = new URI(repo)
uri.getScheme == "https"
}
val hostOpt = Option.when(isHttps)(new URI(repo).getHost)
val maybeCredentials: Either[BuildException, Option[PublishCredentials]] = hostOpt match {
case None => Right(None)
case Some(host) =>
configDb().get(Keys.publishCredentials).wrapConfigException.map { credListOpt =>
credListOpt.flatMap { credList =>
credList.find { cred =>
cred.host == host &&
(isHttps || cred.httpsOnly.contains(false))
}
}
}
}
}
val isSonatype =
hostOpt.exists(host => host == "oss.sonatype.org" || host.endsWith(".oss.sonatype.org"))
val passwordOpt = publishOptions.contextual(isCi).repoPassword match {
case None => value(maybeCredentials).flatMap(_.password)
case other => other.map(_.toConfig)
}
passwordOpt.map(_.get()) match {
case None => None
case Some(password) =>
val userOpt = publishOptions.contextual(isCi).repoUser match {
case None => value(maybeCredentials).flatMap(_.user)
case other => other.map(_.toConfig)
}
val realmOpt = publishOptions.contextual(isCi).repoRealm match {
case None =>
value(maybeCredentials)
.flatMap(_.realm)
.orElse {
if (isSonatype) Some("Sonatype Nexus Repository Manager")
else None
}
case other => other
}
val auth = Authentication(userOpt.fold("")(_.get().value), password.value)
Some(realmOpt.fold(auth)(auth.withRealm))
}
val passwordOpt = publishOptions.contextual(isCi).repoPassword match {
case None => value(maybeCredentials).flatMap(_.password)
case other => other.map(_.toConfig)
}
passwordOpt.map(_.get()) match {
case None => None
case Some(password) =>
val userOpt = publishOptions.contextual(isCi).repoUser match {
case None => value(maybeCredentials).flatMap(_.user)
case other => other.map(_.toConfig)
}
val realmOpt = publishOptions.contextual(isCi).repoRealm match {
case None =>
value(maybeCredentials)
.flatMap(_.realm)
.orElse {
if (isSonatype) Some("Sonatype Nexus Repository Manager")
else None
}
case other => other
}
val auth = Authentication(userOpt.fold("")(_.get().value), password.value)
Some(realmOpt.fold(auth)(auth.withRealm))
}
}
}

val repoParams = {

Expand Down Expand Up @@ -837,32 +846,28 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
}
}

val isSonatype: Boolean = {
val uri = new URI(repoParams.repo.snapshotRepo.root)
val hostOpt = Option.when(uri.getScheme == "https")(uri.getHost)

hostOpt.exists(host => host == "oss.sonatype.org" || host.endsWith(".oss.sonatype.org"))
}

val now = Instant.now()
val (fileSet0, modVersionOpt) = value {
it
// TODO Allow to add test JARs to the main build artifacts
.filter(_._1.scope != Scope.Test)
.map {
case (build, docBuildOpt) =>
val isSonatype = {
val hostOpt = {
val repo = repoParams.repo.snapshotRepo.root
val uri = new URI(repo)
if (uri.getScheme == "https") Some(uri.getHost)
else None
}
hostOpt.exists(host =>
host == "oss.sonatype.org" || host.endsWith(".oss.sonatype.org")
)
}
buildFileSet(
build,
docBuildOpt,
workingDir,
now,
isIvy2LocalLike = repoParams.isIvy2LocalLike,
isCi = isCi,
isSonatype = isSonatype,
isSonatype,
logger
)
}
Expand Down Expand Up @@ -1029,17 +1034,32 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
if (repoParams.isIvy2LocalLike) fileSet2
else fileSet2.order(ec).unsafeRun()(ec)

val isSnapshot0 = modVersionOpt.exists(_._2.endsWith("SNAPSHOT"))
val authOpt0 = value(authOpt(repoParams.repo.repo(isSnapshot0).root))
val isSnapshot0 = modVersionOpt.exists(_._2.endsWith("SNAPSHOT"))
val authOpt0 = value(authOpt(repoParams.repo.repo(isSnapshot0).root, isSonatype))
val asciiRegex = """[\u0000-\u007f]*""".r
val usernameOnlyAscii = authOpt0.exists(auth => asciiRegex.matches(auth.user))
val passwordOnlyAscii = authOpt0.exists(_.passwordOpt.exists(pass => asciiRegex.matches(pass)))

if (repoParams.shouldAuthenticate && authOpt0.isEmpty)
logger.diagnostic(
"Publishing to a repository that needs authentication, but no credentials are available.",
Severity.Warning
)
val repoParams0 = repoParams.withAuth(authOpt0)
val repoParams0: RepoParams = repoParams.withAuth(authOpt0)
val isLegacySonatype = isSonatype && !repoParams0.repo.releaseRepo.root.contains("s01")
val hooksDataOpt = Option.when(!dummy) {
try repoParams0.hooks.beforeUpload(finalFileSet, isSnapshot0).unsafeRun()(ec)
catch {
case NonFatal(e)
if "Failed to get .*oss\\.sonatype\\.org.*/staging/profiles \\(http status: 403,".r.unanchored.matches(
e.getMessage
) =>
logger.exit(new WrongSonatypeServerError(isLegacySonatype))
case NonFatal(e)
if "Failed to get .*oss\\.sonatype\\.org.*/staging/profiles \\(http status: 401,".r.unanchored.matches(
e.getMessage
) =>
logger.exit(new InvalidSonatypePublishCredentials(usernameOnlyAscii, passwordOnlyAscii))
case NonFatal(e) =>
throw new Exception(e)
}
Expand Down Expand Up @@ -1087,6 +1107,37 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
}

errors.toList match {
case (h @ (_, _, e: Upload.Error.HttpError)) :: _
if isSonatype && errors.distinctBy(_._3.getMessage()).size == 1 =>
val httpCodeRegex = "HTTP (\\d+)\n.*".r
e.getMessage() match {
case httpCodeRegex("403") =>
logger.error(
s"""
|Uploading files failed!
|Possible causes:
|- no rights to publish under this organization
|- organization name is misspelled
| -> have you registered your organisation yet?
|""".stripMargin
)
case _ => throw new UploadError(::(h, Nil))
}
case _ :: _ if isSonatype && errors.forall {
case (_, _, _: Upload.Error.Unauthorized) => true
case _ => false
} =>
logger.error(
s"""
|Uploading files failed!
|Possible causes:
|- incorrect Sonatype credentials
|- incorrect Sonatype server was used, try ${
if isLegacySonatype then "'central-s01'" else "'central'"
}
| -> consult publish subcommand documentation
|""".stripMargin
)
case h :: t =>
value(Left(new UploadError(::(h, t))))
case Nil =>
Expand Down
24 changes: 24 additions & 0 deletions modules/cli/src/main/scala/scala/cli/errors/InvalidSonatypePublishCredentials.scala
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package scala.cli.errors

import scala.build.errors.BuildException

final class InvalidSonatypePublishCredentials(usernameIsAscii: Boolean, passwordIsAscii: Boolean)
extends BuildException(
if (usernameIsAscii && passwordIsAscii)
"Username or password to the publish repository are incorrect"
else
s"Your Sonatype ${InvalidSonatypePublishCredentials.isUsernameOrPassword(
usernameIsAscii,
passwordIsAscii
)} unsupported characters"
)

object InvalidSonatypePublishCredentials {
def isUsernameOrPassword(usernameIsAscii: Boolean, passwordIsAscii: Boolean): String =
if (!usernameIsAscii && !passwordIsAscii)
"password and username contain"
else if (!usernameIsAscii)
"username contains"
else
"password contains"
}
8 changes: 8 additions & 0 deletions modules/cli/src/main/scala/scala/cli/errors/WrongSonatypeServerError.scala
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package scala.cli.errors

import scala.build.errors.BuildException

final class WrongSonatypeServerError(legacyChosen: Boolean)
extends BuildException(
s"Wrong Sonatype server, try ${if legacyChosen then "'central-s01'" else "'central'"}"
)
3 changes: 1 addition & 2 deletions modules/core/src/main/scala/scala/build/internals/OsLibc.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ object OsLibc {
else s"temurin:$jvmVersion"
}

def defaultJvm(os: String): String = {
def defaultJvm(os: String): String =
baseDefaultJvm(os, defaultJvmVersion)
}

def javaVersion(javaCmd: String): Int = {
val javaVersionOutput = os.proc(javaCmd, "-version").call(
Expand Down

0 comments on commit c9d3b26

Please sign in to comment.