Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 10:45:39 +03:00
Code Issues Projects Releases Wiki Activity

Add support for ed25519 SSH identity files

Browse Source
This commit is contained in:
Jason Haslam 2019-01-06 20:17:04 -07:00
parent a738dad009
commit df1a4ca8c7
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep/libssh2/libssh2

@ -1 +1 @@
Subproject commit 54bef4c5dad868a9d45fdbfca9729b191c0abab5
Subproject commit 31aea1ec68d50f37b544f4e0157cd1657084b689

31
src/git/Remote.cpp
View File

@ -33,19 +33,23 @@ namespace git {
namespace {
const QString kLogKey = "remote/log";
const QStringList kKeyKinds = {"ed25519", "rsa", "dsa"};
bool keyFile(const QString &kind, QString &key)
bool keyFile(QString &key)
{
QDir dir = QDir::home();
if (!dir.cd(".ssh"))
return false;
QString tmp = QString("id_%1").arg(kind);
if (!dir.exists(tmp))
return false;
foreach (const QString &kind, kKeyKinds) {
QString name = QString("id_%1").arg(kind);
if (dir.exists(name)) {
key = dir.absoluteFilePath(name);
return true;
}
}
key = dir.absoluteFilePath(tmp);
return true;
return false;
}
QString hostName(const QString &url)
@ -266,7 +270,7 @@ int Remote::Callbacks::credentials(
giterr_set_str(GITERR_NET, err.toUtf8());
return -1;
}
} else if (!keyFile("rsa", key) && !keyFile("dsa", key)) {
} else if (!keyFile(key)) {
giterr_set_str(GITERR_NET, "failed to find SSH identity file");
return -1;
}
@ -283,12 +287,15 @@ int Remote::Callbacks::credentials(
}
QTextStream in(&file);
in.readLine(); // -----BEGIN RSA PRIVATE KEY-----
in.readLine(); // -----BEGIN PRIVATE KEY-----
QString line = in.readLine();
if (!line.startsWith("Proc-Type:") || !line.endsWith("ENCRYPTED"))
return git_cred_ssh_key_new(out, name,
!pub.isEmpty() ? pub.toLocal8Bit().constData() : nullptr,
key.toLocal8Bit(), nullptr);
if (!line.startsWith("Proc-Type:") || !line.endsWith("ENCRYPTED")) {
QByteArray base64 = QByteArray::fromBase64(line.toLocal8Bit());
if (!base64.contains("aes256-ctr") || !base64.contains("bcrypt"))
return git_cred_ssh_key_new(out, name,
!pub.isEmpty() ? pub.toLocal8Bit().constData() : nullptr,
key.toLocal8Bit(), nullptr);
}
// Prompt for passphrase to decrypt key.
QString passphrase;