Preserve label data when re-encrypting

Author: Lauris Kaplinski

client/CDocSupport.cpp

@@ -22,6 +22,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QtEndian>
 #include <QtCore/QTemporaryFile>
+#include <QtCore/QUrlQuery>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QSslKey>
 #include <QLoggingCategory>
@@ -449,23 +450,55 @@ StreamListSource::next(std::string& name, int64_t& size)
 	return libcdoc::OK;
 }
 
+static void
+recode_label(std::string& label, uint64_t& expiry)
+{
+	if(!label.starts_with("data:")) return;
+	auto values = libcdoc::Lock::parseLabel(label);
+	if (!values.contains("v") || !values.contains("type")) return;
+	std::string v = values.at("v");
+	values.erase("v");
+	std::string type = values.at("type");
+	values.erase("type");
+	std::string expiry_str = values.at("server_exp");
+	values.erase("server_exp");
+	if (!expiry_str.empty()) expiry = std::stoll(expiry_str);
+	QUrlQuery q;
+	q.setQueryItems({
+		{QStringLiteral("v"), QString::number(1)},
+		{QStringLiteral("type"), QString::fromStdString(type)}
+	});
+	for (const auto& [key, value] : values) {
+		if (!value.empty())
+			q.addQueryItem(QString::fromStdString(key), QString::fromStdString(value));
+	}
+	label = "data:" + q.query(QUrl::FullyEncoded).toStdString();
+}
+
 libcdoc::Recipient
 makeFromLock(const libcdoc::Lock& lock, const std::string& server_id)
 {
+	uint64_t expiry_ts = 0;
+	std::string label = lock.label;
+	recode_label(label, expiry_ts);
 	switch (lock.type) {
 	case libcdoc::Lock::CDOC1:
 		if (!server_id.empty()) {
-			return libcdoc::Recipient::makeServer(lock.label, lock.getBytes(libcdoc::Lock::CERT), server_id);
+			return libcdoc::Recipient::makeServer(label, lock.getBytes(libcdoc::Lock::CERT), server_id);
 		} else {
-			return libcdoc::Recipient::makeCertificate(lock.label, lock.getBytes(libcdoc::Lock::CERT));
+			return libcdoc::Recipient::makeCertificate(label, lock.getBytes(libcdoc::Lock::CERT));
 		}
 	case libcdoc::Lock::PUBLIC_KEY:
 	case libcdoc::Lock::SERVER: {
 		libcdoc::Recipient::PKType rcpt_type = (lock.pk_type == libcdoc::Lock::RSA) ? libcdoc::Recipient::RSA : libcdoc::Recipient::ECC;
 		if (!server_id.empty()) {
-			return libcdoc::Recipient::makeServer(lock.label, lock.getBytes(libcdoc::Lock::RCPT_KEY), rcpt_type, server_id);
+			libcdoc::Recipient rcpt = libcdoc::Recipient::makeServer(label, lock.getBytes(libcdoc::Lock::RCPT_KEY), rcpt_type, server_id);
+			rcpt.expiry_ts = expiry_ts;
+			return rcpt;
 		} else {
-			return libcdoc::Recipient::makePublicKey(lock.label, lock.getBytes(libcdoc::Lock::RCPT_KEY), rcpt_type);
+			libcdoc::Recipient rcpt = libcdoc::Recipient::makePublicKey(label, lock.getBytes(libcdoc::Lock::RCPT_KEY), rcpt_type);
+			rcpt.expiry_ts = expiry_ts;
+			return rcpt;
 		}
 	}
 	default:

client/widgets/AddressItem.cpp

@@ -66,7 +66,7 @@ AddressItem::AddressItem(const CDKey &key, Type type, QWidget *parent)
 	} else if (ui->key.lock.isValid()) {
 		// Known lock type
 		ui->code.clear();
-		auto map = libcdoc::Recipient::parseLabel(ui->key.lock.label);
+		auto map = libcdoc::Lock::parseLabel(ui->key.lock.label);
 		if (map.contains("cn")) {
 			ui->label = QString::fromStdString(map["cn"]);
 		} else {
@@ -195,7 +195,7 @@ void AddressItem::setIdType() {
 		// Known lock type
 		// Needed to include translation for "ID-CARD"
 		void(QT_TR_NOOP("ID-CARD"));
-		auto items = libcdoc::Recipient::parseLabel(ui->key.lock.label);
+		auto items = libcdoc::Lock::parseLabel(ui->key.lock.label);
 		if (ui->key.lock.isCDoc1()) {
 			const auto &bytes = ui->key.lock.getBytes(libcdoc::Lock::CERT);
 			setIdType(SslCertificate(QByteArray::fromRawData((const char *)bytes.data(), bytes.size()), QSsl::Der));