medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add ipps support

Browse source
This commit is contained in:
Anton Thomasson 2021-06-19 18:16:42 +02:00
parent cb6f836282
commit 01e7e02bcd
15 changed files with 315 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qml/harbour-seaprint.qml
View file

@ -5,6 +5,7 @@ import Nemo.Notifications 1.0
import Nemo.Configuration 1.0
import seaprint.mimer 1.0
import seaprint.settings 1.0
import "pages"
import "components"
@ -151,9 +152,11 @@ ApplicationWindow
defaultValue: SeaPrintSettings.alwaysUseMediaColDefault
}
Component.onCompleted:
ConfigurationValue
{
console.log(SeaPrintSettings.ignoreSslErrorsPath, SeaPrintSettings.ignoreSslErrorsDefault)
id: ignoreSslErrorsSetting
key: SeaPrintSettings.ignoreSslErrorsPath
defaultValue: SeaPrintSettings.ignoreSslErrorsDefault
}
}

1
qml/pages/FirstPage.qml
View file

@ -26,7 +26,6 @@ Page {
else {
IppDiscovery.favourites = []
}
}
property bool initialSSIDchange: true

9
qml/pages/SettingsPage.qml
View file

@ -53,6 +53,15 @@ Page {
}
}
TextSwitch {
text: qsTr("Ignore SSL errors")
description: qsTr("In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.")
checked: ignoreSslErrorsSetting.value
onCheckedChanged: {
ignoreSslErrorsSetting.value = checked
}
}
}
}
}

251
src/ippdiscovery.cpp
View file

@ -1,5 +1,6 @@
#include "ippdiscovery.h"
#include "ippprinter.h"
#include "settings.h"
#include <seaprint_version.h>
#define A 1
@ -10,16 +11,6 @@
#define ALL 255 //for querying
void put_addr(Bytestream& bts, QStringList addr)
{
for(int i = 0; i < addr.length(); i++)
{
QString elem = addr[i];
bts << (quint8)elem.size() << elem.toStdString();
}
bts << (quint8)0;
}
QStringList get_addr(Bytestream& bts)
{
QStringList addr;
@ -50,10 +41,9 @@ QStringList get_addr(Bytestream& bts)
IppDiscovery::IppDiscovery() : QStringListModel(), QQuickImageProvider(QQuickImageProvider::Image, ForceAsynchronousImageLoading)
{
socket = new QUdpSocket(this);
connect(socket, SIGNAL(readyRead()),
this, SLOT(readPendingDatagrams()));
connect(this, SIGNAL(favouritesChanged()),
this, SLOT(update()));
connect(socket, &QUdpSocket::readyRead, this, &IppDiscovery::readPendingDatagrams);
connect(this, &IppDiscovery::favouritesChanged, this, &IppDiscovery::cleanUpdate);
_transactionid = 0;
}
IppDiscovery::~IppDiscovery() {
@ -79,67 +69,201 @@ IppDiscovery* IppDiscovery::instance()
}
void IppDiscovery::discover() {
sendQuery(PTR, {"_ipp","_tcp","local"});
sendQuery(PTR, {"_ipp._tcp.local", "_ipps._tcp.local"});
}
void IppDiscovery::reset() {
_ipp = QStringList();
_rps = QMap<QString,QString>();
_ports = QMap<QString,quint16>();
_targets = QMap<QString,QString>();
_ipp.clear();
_rps.clear();
_ports.clear();
_targets.clear();
_AAs = QMultiMap<QString,QString>();
_AAAAs = QMultiMap<QString,QString>();
_AAs.clear();
_AAAAs.clear();
_outstandingQueries.clear();
setStringList({});
discover();
}
void IppDiscovery::sendQuery(quint16 qtype, QStringList addr) {
qDebug() << "discovering" << qtype << addr;
void IppDiscovery::sendQuery(quint16 qtype, QStringList addrs) {
addrs.removeDuplicates();
QTime now = QTime::currentTime();
QTime aWhileAgo = now.addSecs(-1);
foreach(QString oq, _outstandingQueries.keys())
{
if(_outstandingQueries[oq] < aWhileAgo)
{ // Housekeeping for _outstandingQueries
_outstandingQueries.remove(oq);
}
else if(addrs.contains(oq))
{ // we recently asked about this, remove it
addrs.removeOne(oq);
}
}
if(addrs.empty())
{
qDebug() << "nothing to do";
return;
}
qDebug() << "discovering" << qtype << addrs;
Bytestream query;
quint16 transactionid = 0;
quint16 flags = 0;
quint16 questions = 1;
QMap<QString, quint16> suffixPositions;
query << transactionid << flags << questions << (quint16)0 << (quint16)0 << (quint16)0;
put_addr(query, addr);
query << qtype << (quint16)0x0001;
quint16 flags = 0;
quint16 questions = addrs.length();
query << _transactionid++ << flags << questions << (quint16)0 << (quint16)0 << (quint16)0;
foreach(QString addr, addrs)
{
_outstandingQueries.insert(addr, now);
QStringList addrParts = addr.split(".");
QString addrPart, restAddr;
while(!addrParts.isEmpty())
{
restAddr = addrParts.join(".");
if(suffixPositions.contains(restAddr))
{
query << (quint16)(0xc000 | (0x0fff & suffixPositions[restAddr]));
break;
}
else
{
// We are putting in at least one part of the address, remember where that was
suffixPositions.insert(restAddr, query.size());
addrPart = addrParts.takeFirst();
query << (quint8)addrPart.size() << addrPart.toStdString();
}
}
if(addrParts.isEmpty())
{
// Whole addr was put in without c-pointers, 0-terminate it
query << (quint8)0;
}
query << qtype << (quint16)0x0001;
}
QByteArray bytes((char*)(query.raw()), query.size());
socket->writeDatagram(bytes, QHostAddress("224.0.0.251"), 5353);
}
QString make_addr(QString proto, int defaultPort, quint16 port, QString ip, QString rp)
{
QString maybePort = port != defaultPort ? ":"+QString::number(port) : "";
QString addr = proto+"://"+ip+maybePort+"/"+rp;
return addr;
}
QString make_ipp_addr(quint16 port, QString ip, QString rp)
{
return make_addr("ipp", 631, port, ip, rp);
}
QString make_ipps_addr(quint16 port, QString ip, QString rp)
{
return make_addr("ipps", 443, port, ip, rp);
}
void IppDiscovery::cleanUpdate()
{
setStringList(_favourites);
update();
}
void IppDiscovery::update()
{
QStringList found;
QList<QPair<QString,QString>> ippsIpRps;
for(QStringList::Iterator it = _ipp.begin(); it != _ipp.end(); it++)
foreach(QString it, _ipps)
{
quint16 port = _ports[*it];
QString target = _targets[*it];
QString rp = _rps[*it];
quint16 port = _ports[it];
QString target = _targets[it];
QString rp = _rps[it];
for(QMultiMap<QString,QString>::Iterator ait = _AAs.begin(); ait != _AAs.end(); ait++)
{
if(ait.key() == target)
{
QString ip = ait.value();
QString maybePort = port != 631 ? ":"+QString::number(port) : "";
QString addr = "ipp://"+ip+maybePort+"/"+rp;
QString addr = make_ipps_addr(port, ip, rp);
if(!found.contains(addr))
{
ippsIpRps.append({ip, rp});
found.append(addr);
found.sort(Qt::CaseInsensitive);
}
}
}
}
qDebug() << _favourites << found;
this->setStringList(_favourites+found);
foreach(QString it, _ipp)
{
quint16 port = _ports[it];
QString target = _targets[it];
QString rp = _rps[it];
for(QMultiMap<QString,QString>::Iterator ait = _AAs.begin(); ait != _AAs.end(); ait++)
{
if(ait.key() == target)
{
QString ip = ait.value();
QString addr = make_ipp_addr(port, ip, rp);
// IP+RP assumed unique, don't add ipp version of the printer if ipps already added
if(!found.contains(addr) && !ippsIpRps.contains({ip, rp}))
{
found.append(addr);
}
}
}
}
found.sort(Qt::CaseInsensitive);
// Counting on that _ipp duplicates doesn't resolve fully any erlier than their _ipps counterpart
// TODO?: replace this with some logica that can bpoth add and remove
// and it can consider _favourites, so we can drop cleanUpdate
foreach(QString f, found)
{
if(!this->stringList().contains(f))
{
if(this->insertRow(this->rowCount()))
{
QModelIndex index = this->index(this->rowCount() - 1, 0);
this->setData(index, f);
}
}
}
}
void IppDiscovery::updateAndQueryPtrs(QStringList& ptrs, QStringList new_ptrs)
{
new_ptrs.removeDuplicates();
foreach(QString ptr, new_ptrs)
{
if(!ptrs.contains(ptr))
{
ptrs.append(ptr);
}
// If pointer does not resolve to a target or is missing information, query about it
if(!_targets.contains(ptr) || !_ports.contains(ptr) || !_rps.contains(ptr))
{ // if the PTR doesn't already resolve, ask for everything about it
sendQuery(ALL, {ptr});
}
}
}
void IppDiscovery::readPendingDatagrams()
@ -152,6 +276,7 @@ void IppDiscovery::readPendingDatagrams()
quint16 senderPort;
QStringList new_ipp_ptrs;
QStringList new_ipps_ptrs;
QStringList new_targets;
socket->readDatagram((char*)(resp.raw()), size, &sender, &senderPort);
@ -186,6 +311,10 @@ void IppDiscovery::readPendingDatagrams()
{
new_ipp_ptrs.append(tmpname);
}
else if(aaddr.endsWith("_ipps._tcp.local"))
{
new_ipps_ptrs.append(tmpname);
}
}
else if(atype == TXT)
{
@ -208,14 +337,20 @@ void IppDiscovery::readPendingDatagrams()
QString target = get_addr(resp).join(".");
_ports[aaddr] = port;
_targets[aaddr] = target;
new_targets.append(target);
if(!new_targets.contains(target))
{
new_targets.append(target);
}
}
else if(atype == A)
{
quint32 addr;
resp >> addr;
QHostAddress haddr(addr);
_AAs.insert(aaddr, haddr.toString());
if(!_AAs.contains(aaddr, haddr.toString()))
{
_AAs.insert(aaddr, haddr.toString());
}
}
else
{
@ -231,7 +366,9 @@ void IppDiscovery::readPendingDatagrams()
return;
}
qDebug() << "new ipp ptrs" << new_ipp_ptrs;
qDebug() << "new ipps ptrs" << new_ipps_ptrs;
qDebug() << "ipp ptrs" << _ipp;
qDebug() << "ipp ptrs" << _ipps;
qDebug() << "rps" << _rps;
qDebug() << "ports" << _ports;
qDebug() << "new targets" << new_targets;
@ -239,27 +376,27 @@ void IppDiscovery::readPendingDatagrams()
qDebug() << "AAs" << _AAs;
qDebug() << "AAAAs" << _AAAAs;
for(QStringList::Iterator it = new_ipp_ptrs.begin(); it != new_ipp_ptrs.end(); it++)
{
if(!_ipp.contains(*it))
{
_ipp.append(*it);
}
// If pointer does not resolve to a target or is missing information, query about it
if( !_targets.contains(*it) || !_ports.contains(*it) || !_rps.contains(*it))
{ // if the PTR doesn't already resolve, ask for everything about it
sendQuery(ALL, it->split('.'));
}
}
for(QStringList::Iterator it = new_targets.begin(); it != new_targets.end(); it++)
// These will send one query per unique new ptr.
// some responders doesn't give TXT records for more than one thing at at time :(
updateAndQueryPtrs(_ipp, new_ipp_ptrs);
updateAndQueryPtrs(_ipps, new_ipps_ptrs);
QStringList unresolvedAddrs;
foreach(QString target, new_targets)
{
// If target does not resolve to an address, query about it
if(!_AAs.contains(*it))
if(!_AAs.contains(target))
{
sendQuery(ALL, it->split('.'));
unresolvedAddrs.append(target);
}
}
if(!unresolvedAddrs.empty())
{
sendQuery(A, unresolvedAddrs);
}
}
this->update();
@ -290,9 +427,7 @@ QImage IppDiscovery::requestImage(const QString &id, QSize *size, const QSize &r
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::UserAgentHeader, "SeaPrint " SEAPRINT_VERSION);
connect(nam, &QNetworkAccessManager::sslErrors,
&IppPrinter::ignoreKnownSslErrors);
connect(nam, &QNetworkAccessManager::sslErrors, &IppPrinter::onSslErrors);
QNetworkReply* reply = nam->get(request);

13
src/ippdiscovery.h
View file

@ -17,20 +17,25 @@ public:
static IppDiscovery* instance();
Q_PROPERTY(QStringList favourites MEMBER _favourites NOTIFY favouritesChanged)
Q_INVOKABLE void discover();
Q_INVOKABLE void reset();
signals:
void favouritesChanged();
void ignoreSslErrorsChanged();
public slots:
void readPendingDatagrams();
void cleanUpdate();
void update();
protected:
private:
static IppDiscovery* m_Instance;
quint16 _transactionid;
IppDiscovery();
~IppDiscovery();
IppDiscovery(const IppDiscovery &);
@ -38,9 +43,15 @@ private:
void sendQuery(quint16 qtype, QStringList addr);
void sendQuery(quint16 qtype, QStringList prefixes, QStringList suffixes);
void updateAndQueryPtrs(QStringList& ptrs, QStringList new_ptrs);
QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
QStringList _ipp;
QStringList _ipps;
QMap<QString,QString> _rps;
QMap<QString,quint16> _ports;
QMap<QString,QString> _targets;
@ -48,6 +59,8 @@ private:
QMultiMap<QString,QString> _AAs;
QMultiMap<QString,QString> _AAAAs;
QMap<QString, QTime> _outstandingQueries;
QStringList _favourites;
QUdpSocket* socket;
};

64
src/ippprinter.cpp
View file

@ -13,16 +13,16 @@ IppPrinter::IppPrinter()
_job_cancel_nam = new QNetworkAccessManager(this);
connect(_nam, &QNetworkAccessManager::finished, this, &IppPrinter::getPrinterAttributesFinished);
connect(_nam, &QNetworkAccessManager::sslErrors, this, &IppPrinter::ignoreKnownSslErrors);
connect(_nam, &QNetworkAccessManager::sslErrors, &IppPrinter::onSslErrors);
connect(_print_nam, &QNetworkAccessManager::finished, this, &IppPrinter::printRequestFinished);
connect(_print_nam, &QNetworkAccessManager::sslErrors, this, &IppPrinter::ignoreKnownSslErrors);
connect(_print_nam, &QNetworkAccessManager::sslErrors, &IppPrinter::onSslErrors);
connect(_jobs_nam, &QNetworkAccessManager::finished,this, &IppPrinter::getJobsRequestFinished);
connect(_jobs_nam, &QNetworkAccessManager::sslErrors, this, &IppPrinter::ignoreKnownSslErrors);
connect(_jobs_nam, &QNetworkAccessManager::sslErrors, &IppPrinter::onSslErrors);
connect(_job_cancel_nam, &QNetworkAccessManager::finished,this, &IppPrinter::cancelJobFinished);
connect(_job_cancel_nam, &QNetworkAccessManager::sslErrors, this, &IppPrinter::ignoreKnownSslErrors);
connect(_job_cancel_nam, &QNetworkAccessManager::sslErrors, &IppPrinter::onSslErrors);
QObject::connect(this, &IppPrinter::urlChanged, this, &IppPrinter::onUrlChanged);
qRegisterMetaType<QTemporaryFile*>("QTemporaryFile*");
@ -68,9 +68,9 @@ void IppPrinter::setUrl(QString url_s)
qDebug() << url.scheme();
if(url.scheme() != "ipp" /* or ipps */ && url.scheme() != "file")
// If not already a good scheme, try to fixup, or give an empty url
if(url.scheme() != "ipp" && url.scheme() != "ipps" && url.scheme() != "file")
{
//if https -> ipps, else:
if(url.scheme() == "")
{
url = QUrl("ipp://"+url_s); // Why isn't setScheme working?
@ -78,6 +78,9 @@ void IppPrinter::setUrl(QString url_s)
else if (url.scheme() == "http") {
url.setScheme("ipp");
}
else if (url.scheme() == "https") {
url.setScheme("ipps");
}
else {
url = QUrl();
}
@ -104,6 +107,12 @@ void IppPrinter::refresh() {
// _additionalDocumentFormats = QStringList();
// emit additionalDocumentFormatsChanged();
// FFFFUUUU
_nam->clearAccessCache();
_jobs_nam->clearAccessCache();
_job_cancel_nam->clearAccessCache();
_print_nam->clearAccessCache();
if(_url.scheme() == "file")
{
_attrs = QJsonObject();
@ -163,7 +172,7 @@ void IppPrinter::UpdateAdditionalDocumentFormats()
void IppPrinter::getPrinterAttributesFinished(QNetworkReply *reply)
{
qDebug() << reply->error() << reply->errorString() << reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toString();
qDebug() << reply->request().url() << reply->error() << reply->errorString() << reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toString();
_attrs = QJsonObject();
if(reply->error() == QNetworkReply::NoError)
@ -254,25 +263,14 @@ void IppPrinter::cancelJobFinished(QNetworkReply *reply)
}
void IppPrinter::ignoreKnownSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
void IppPrinter::onSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
QList<QSslError> IgnoredSslErrors = {QSslError::NoError,
QSslError::SelfSignedCertificate,
QSslError::HostNameMismatch,
QSslError::UnableToGetLocalIssuerCertificate,
QSslError::UnableToVerifyFirstCertificate
};
qDebug() << errors;
for (QList<QSslError>::const_iterator it = errors.constBegin(); it != errors.constEnd(); it++) {
if(!IgnoredSslErrors.contains(it->error())) {
qDebug() << "Bad error: " << int(it->error()) << it->error();
return;
}
bool ignore = Settings::instance()->ignoreSslErrors();
qDebug() << reply->request().url() << "SSL handshake failed" << errors << ignore;
if(ignore)
{
reply->ignoreSslErrors(errors);
}
// For whatever reason, it doesn't work to pass IgnoredSslErrors here
reply->ignoreSslErrors(errors);
}
void IppPrinter::convertDone(QNetworkRequest request, QTemporaryFile* data)
@ -600,10 +598,21 @@ bool IppPrinter::cancelJob(qint32 jobId) {
}
QUrl IppPrinter::httpUrl() {
qDebug() << _url;
QUrl url = _url;
url.setScheme("http");
if(url.port() == -1) {
url.setPort(631);
if(url.scheme() == "ipps")
{
url.setScheme("https");
if(url.port() == -1) {
url.setPort(443);
}
}
else
{
url.setScheme("http");
if(url.port() == -1) {
url.setPort(631);
}
}
return url;
}
@ -614,6 +623,7 @@ QNetworkRequest IppPrinter::mkReq() {
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/ipp");
request.setHeader(QNetworkRequest::UserAgentHeader, "SeaPrint " SEAPRINT_VERSION);
request.setRawHeader("Accept-Encoding", "identity");
request.setSslConfiguration(QSslConfiguration());
return request;
}

5
src/ippprinter.h
View file

@ -5,6 +5,7 @@
#include <QNetworkAccessManager>
#include "ippmsg.h"
#include "convertworker.h"
#include <mlite5/MGConfItem>
class IppPrinter : public QObject
{
@ -17,7 +18,6 @@ class IppPrinter : public QObject
Q_PROPERTY(QString busyMessage MEMBER _busyMessage NOTIFY busyMessageChanged)
Q_PROPERTY(QString progress MEMBER _progress NOTIFY progressChanged)
public:
IppPrinter();
~IppPrinter();
@ -73,7 +73,7 @@ public slots:
void getJobsRequestFinished(QNetworkReply* reply);
void cancelJobFinished(QNetworkReply* reply);
static void ignoreKnownSslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
static void onSslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
void convertDone(QNetworkRequest request, QTemporaryFile* data);
void convertFailed(QString message);
@ -108,7 +108,6 @@ private:
QThread _workerThread;
ConvertWorker* _worker;
};
#endif // IPPPRINTER_H

1
src/overrider.cpp
View file

@ -7,7 +7,6 @@ Overrider::Overrider()
{
// QFile file(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)+"/overrides");
QFile file(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.seaprint_overrides");
qDebug() << "AAAAAAAAAAAAAAA" << file.fileName();
if(file.open(QIODevice::ReadOnly))
{
QJsonDocument JsonDocument = QJsonDocument::fromJson(file.readAll());

8
translations/harbour-seaprint-de.ts
View file

@ -511,6 +511,14 @@
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>

8
translations/harbour-seaprint-es.ts
View file

@ -511,6 +511,14 @@
<source>Settings</source>
<translation type="unfinished">Ajustes</translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>

8
translations/harbour-seaprint-fr.ts
View file

@ -511,6 +511,14 @@
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>

8
translations/harbour-seaprint-nl.ts
View file

@ -511,6 +511,14 @@
<source>Settings</source>
<translation>Instellingen</translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>

8
translations/harbour-seaprint-pl.ts
View file

@ -511,6 +511,14 @@
<source>Use the attribute media-col instead of media for paper sizes. I.e. do parametric selection of print media rather than by name. If you use zero print margins, parametric selection will be used regardless of this setting.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>

8
translations/harbour-seaprint-zh_CN.ts
View file

@ -511,6 +511,14 @@
<source>Settings</source>
<translation>设置</translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>

8
translations/harbour-seaprint.ts
View file

@ -511,6 +511,14 @@
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ignore SSL errors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In order to work with self-signed certificates of printers and CUPS instances, SSL errors needs to be ignored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SupplyItem</name>