MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[build scripts] macOS: use ssh-agent if it's available during build

Browse Source 
GitOrigin-RevId: 64c70aa99eed36fd2887a84fc207686645ca6348
This commit is contained in:
Vladislav Rassokhin
2021-11-17 00:24:50 +03:00
committed by intellij-monorepo-bot
parent 222a4d0424
commit b691b777da
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tasks/intellij.idea.community.build.tasks.iml
View File

@@ -56,5 +56,7 @@
<orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.immutableKeyValueStore" />
<orderEntry type="module" module-name="intellij.platform.util.rt.java8" />
<orderEntry type="library" name="jsch-agent-proxy" level="project" />
<orderEntry type="library" name="jsch-agent-proxy-sshj" level="project" />
</component>
</module>

39
build/tasks/src/org/jetbrains/intellij/build/tasks/sign.kt
View File

@@ -3,6 +3,11 @@
package org.jetbrains.intellij.build.tasks
import com.jcraft.jsch.agentproxy.AgentProxy
import com.jcraft.jsch.agentproxy.AgentProxyException
import com.jcraft.jsch.agentproxy.Connector
import com.jcraft.jsch.agentproxy.ConnectorFactory
import com.jcraft.jsch.agentproxy.sshj.AuthAgent
import io.opentelemetry.api.common.AttributeKey
import io.opentelemetry.api.common.Attributes
import net.schmizz.keepalive.KeepAliveProvider
@@ -10,14 +15,13 @@ import net.schmizz.sshj.DefaultConfig
import net.schmizz.sshj.SSHClient
import net.schmizz.sshj.sftp.SFTPClient
import net.schmizz.sshj.transport.verification.PromiscuousVerifier
import net.schmizz.sshj.userauth.method.AuthMethod
import org.apache.commons.compress.archivers.zip.Zip64Mode
import org.apache.commons.compress.archivers.zip.ZipArchiveEntryPredicate
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
import org.apache.commons.compress.archivers.zip.ZipFile
import org.jetbrains.intellij.build.io.NioFileDestination
import org.jetbrains.intellij.build.io.NioFileSource
import org.jetbrains.intellij.build.io.runAsync
import org.jetbrains.intellij.build.io.writeNewFile
import org.jetbrains.intellij.build.io.*
import java.nio.charset.StandardCharsets
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.StandardCopyOption
@@ -303,6 +307,25 @@ private fun generateRemoteDirName(remoteDirPrefix: String): String {
return "$remoteDirPrefix-$currentDateTimeString-${java.lang.Long.toUnsignedString(random.nextLong(), Character.MAX_RADIX)}"
}
@Throws(java.lang.Exception::class)
private fun getAuthMethods(agent: AgentProxy): List<AuthMethod> {
val identities = agent.identities
System.getLogger("org.jetbrains.intellij.build.tasks.Sign")
.info("SSH-Agent identities: ${identities.joinToString { String(it.comment, StandardCharsets.UTF_8) }}")
return identities.map { AuthAgent(agent, it) }
}
private fun getAgentConnector(): Connector? {
try {
return ConnectorFactory.getDefault().createConnector()
}
catch (ignored: AgentProxyException) {
System.getLogger("org.jetbrains.intellij.build.tasks.Sign")
.warn("SSH-Agent connector creation failed: ${ignored.message}")
}
return null
}
private inline fun executeTask(host: String,
user: String,
password: String,
@@ -315,7 +338,13 @@ private inline fun executeTask(host: String,
SSHClient(config).use { ssh ->
ssh.addHostKeyVerifier(PromiscuousVerifier())
ssh.connect(host)
ssh.authPassword(user, password)
val agentProxy = getAgentConnector()?.let { AgentProxy(it) }
if (agentProxy != null) {
ssh.auth(user, getAuthMethods(agentProxy))
}
else {
ssh.authPassword(user, password)
}
ssh.newSFTPClient().use { sftp ->
val remoteDir = generateRemoteDirName(remoteDirPrefix)