loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Make header checks case insensitive as described in RFC (#8874)

Browse Source
This commit is contained in:
sunn 2021-03-06 08:49:51 +01:00 committed by GitHub
parent a13b222764
commit 65a31f1d9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache vendored
View File

@ -423,10 +423,26 @@ void {{prefix}}HttpRequestWorker::on_reply_timeout(QNetworkReply *reply) {
} }
void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) {
if (getResponseHeaders().contains(QString("Content-Disposition"))) { QString contentDispositionHdr;
auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); QString contentTypeHdr;
QString contentEncodingHdr;
for(auto hdr: getResponseHeaders().keys()){
if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){
contentDispositionHdr = getResponseHeaders().value(hdr);
}
if(hdr.compare(QString("Content-Type"), Qt::CaseInsensitive) == 0){
contentTypeHdr = getResponseHeaders().value(hdr);
}
if(hdr.compare(QString("Content-Encoding"), Qt::CaseInsensitive) == 0){
contentEncodingHdr = getResponseHeaders().value(hdr);
}
}
if (!contentDispositionHdr.isEmpty()) {
auto contentDisposition = contentDispositionHdr.split(QString(";"), SKIP_EMPTY_PARTS);
auto contentType = auto contentType =
getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS).first() : QString(); !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS).first() : QString();
if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) {
QString filename = QUuid::createUuid().toString(); QString filename = QUuid::createUuid().toString();
for (const auto &file : contentDisposition) { for (const auto &file : contentDisposition) {
@ -440,13 +456,13 @@ void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) {
files.insert(filename, felement); files.insert(filename, felement);
} }
} else if (getResponseHeaders().contains(QString("Content-Type"))) { } else if (!contentTypeHdr.isEmpty()) {
auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); auto contentType = contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS);
if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) { if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) {
// TODO : Handle Multipart responses // TODO : Handle Multipart responses
} else { } else {
if(headers.contains("Content-Encoding")){ if(!contentEncodingHdr.isEmpty()){
auto encoding = headers.value("Content-Encoding").split(QString(";"), SKIP_EMPTY_PARTS); auto encoding = contentEncodingHdr.split(QString(";"), SKIP_EMPTY_PARTS);
if(encoding.count() > 0){ if(encoding.count() > 0){
auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS); auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS);
if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){ if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){

30
samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp
View File

@ -430,10 +430,26 @@ void PFXHttpRequestWorker::on_reply_timeout(QNetworkReply *reply) {
} }
void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { void PFXHttpRequestWorker::process_response(QNetworkReply *reply) {
if (getResponseHeaders().contains(QString("Content-Disposition"))) { QString contentDispositionHdr;
auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); QString contentTypeHdr;
QString contentEncodingHdr;
for(auto hdr: getResponseHeaders().keys()){
if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){
contentDispositionHdr = getResponseHeaders().value(hdr);
}
if(hdr.compare(QString("Content-Type"), Qt::CaseInsensitive) == 0){
contentTypeHdr = getResponseHeaders().value(hdr);
}
if(hdr.compare(QString("Content-Encoding"), Qt::CaseInsensitive) == 0){
contentEncodingHdr = getResponseHeaders().value(hdr);
}
}
if (!contentDispositionHdr.isEmpty()) {
auto contentDisposition = contentDispositionHdr.split(QString(";"), SKIP_EMPTY_PARTS);
auto contentType = auto contentType =
getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS).first() : QString(); !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS).first() : QString();
if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) {
QString filename = QUuid::createUuid().toString(); QString filename = QUuid::createUuid().toString();
for (const auto &file : contentDisposition) { for (const auto &file : contentDisposition) {
@ -447,13 +463,13 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) {
files.insert(filename, felement); files.insert(filename, felement);
} }
} else if (getResponseHeaders().contains(QString("Content-Type"))) { } else if (!contentTypeHdr.isEmpty()) {
auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); auto contentType = contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS);
if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) { if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) {
// TODO : Handle Multipart responses // TODO : Handle Multipart responses
} else { } else {
if(headers.contains("Content-Encoding")){ if(!contentEncodingHdr.isEmpty()){
auto encoding = headers.value("Content-Encoding").split(QString(";"), SKIP_EMPTY_PARTS); auto encoding = contentEncodingHdr.split(QString(";"), SKIP_EMPTY_PARTS);
if(encoding.count() > 0){ if(encoding.count() > 0){
auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS); auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS);
if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){ if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){