GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Handle OpenPGP Diagnostic log

Browse Source 
* lang/qt/src/threadedjobmixin.cpp (_detail::audit_log_as_html):
Handle OpenPGP audit log differently.
This commit is contained in:
Andre Heinecke 2018-07-05 11:28:08 +02:00
parent 629afebe50
commit 66c2a99422
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lang/qt/src/threadedjobmixin.cpp
View File

@ -53,7 +53,16 @@
using namespace QGpgME; using namespace QGpgME;
using namespace GpgME; using namespace GpgME;
static const unsigned int GetAuditLogFlags = Context::AuditLogWithHelp | Context::HtmlAuditLog; static QString markupDiagnostics(const QString &data)
{
// First ensure that we don't have html in the diag.
QString ret = QStringLiteral("<pre>%1</pre>").arg(data.toHtmlEscaped());
return ret;
}
static const unsigned int CMSAuditLogFlags = Context::AuditLogWithHelp | Context::HtmlAuditLog;
static const unsigned int OpenPGPAuditLogFlags = Context::DiagnosticAuditLog;
QString _detail::audit_log_as_html(Context *ctx, GpgME::Error &err) QString _detail::audit_log_as_html(Context *ctx, GpgME::Error &err)
{ {
@ -61,13 +70,26 @@ QString _detail::audit_log_as_html(Context *ctx, GpgME::Error &err)
QGpgME::QByteArrayDataProvider dp; QGpgME::QByteArrayDataProvider dp;
Data data(&dp); Data data(&dp);
assert(!data.isNull()); assert(!data.isNull());
if ((err = ctx->lastError()) || (err = ctx->getAuditLog(data, GetAuditLogFlags))) {
if (ctx->protocol() == OpenPGP) {
if ((err = ctx->getAuditLog(data, OpenPGPAuditLogFlags))) {
return QString::fromLocal8Bit(err.asString());
}
const QByteArray ba = dp.data();
return markupDiagnostics(QString::fromUtf8(ba.data(), ba.size()));
}
if (ctx->protocol() == CMS) {
if ((err = ctx->lastError()) || (err = ctx->getAuditLog(data, CMSAuditLogFlags))) {
return QString::fromLocal8Bit(err.asString()); return QString::fromLocal8Bit(err.asString());
} }
const QByteArray ba = dp.data(); const QByteArray ba = dp.data();
return QString::fromUtf8(ba.data(), ba.size()); return QString::fromUtf8(ba.data(), ba.size());
} }
return QStringLiteral("Unsupported protocol for Audit Log");
}
static QList<QByteArray> from_sl(const QStringList &sl) static QList<QByteArray> from_sl(const QStringList &sl)
{ {
QList<QByteArray> result; QList<QByteArray> result;