Mercurial > hg > orthanc
view OrthancServer/DicomProtocol/DicomFindAnswers.cpp @ 2248:69b0f4e8a49b
Escape multipart type parameter value in Content-Type header
## Summary
Multipart responses do not quote/escape the value of their type
parameter (the subtype) even though it always contains at least one
special character (the slash "/"), which confuses standard-compliant
HTTP clients.
## Details
The Content-Type header in HTTP is in RFC 7231, Section 3.1.1.5:
https://tools.ietf.org/html/rfc7231#section-3.1.1.5
The section defers to the media type section (3.1.1.1) for the syntax of
the media type:
https://tools.ietf.org/html/rfc7231#section-3.1.1.1
This states that a parameter value can be quoted:
parameter = token "=" ( token / quoted-string )
A parameter value that matches the token production can be transmitted
either as a token or within a quoted-string. The quoted and unquoted
values are equivalent.
Tokens are defined in RFC 7230, Section 3.2.6 (via RFC 7231, appendix
C):
https://tools.ietf.org/html/rfc7231#appendix-C
https://tools.ietf.org/html/rfc7230#section-3.2.6
Here we observe that tokens cannot contain a slash "/" character:
token = 1*tchar
tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*"
/ "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
/ DIGIT / ALPHA
; any VCHAR, except delimiters
Delimiters are chosen from the set of US-ASCII visual characters not
allowed in a token (DQUOTE and "(),/:;<=>?@[\]{}").
However, the current implementation does not quote/escape the value of
the type parameter:
multipart/related; type=application/dicom
Instead, it should be:
multipart/related; type="application/dicom"
All of this also seems to apply to the MIME Content-Type header
definition, even though it is a little different:
https://www.iana.org/assignments/message-headers
https://tools.ietf.org/html/rfc2045#section-5.1
https://tools.ietf.org/html/rfc2387
author | Thibault Nélis <tn@osimis.io> |
---|---|
date | Mon, 16 Jan 2017 13:07:11 +0100 |
parents | a3a65de1840f |
children | b8969010b534 |
line wrap: on
line source
/** * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017 Osimis, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * In addition, as a special exception, the copyright holders of this * program give permission to link the code of its release with the * OpenSSL project's "OpenSSL" library (or with modified versions of it * that use the same license as the "OpenSSL" library), and distribute * the linked executables. You must obey the GNU General Public License * in all respects for all of the code used other than "OpenSSL". If you * modify file(s) with this exception, you may extend this exception to * your version of the file(s), but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from your * version. If you delete this exception statement from all source files * in the program, then also delete it here. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ #include "../PrecompiledHeadersServer.h" #include "DicomFindAnswers.h" #include "../OrthancInitialization.h" #include "../FromDcmtkBridge.h" #include "../../Core/OrthancException.h" #include <memory> #include <dcmtk/dcmdata/dcfilefo.h> #include <boost/noncopyable.hpp> namespace Orthanc { void DicomFindAnswers::AddAnswerInternal(ParsedDicomFile* answer) { std::auto_ptr<ParsedDicomFile> protection(answer); if (isWorklist_) { // These lines are necessary when serving worklists, otherwise // Orthanc does not behave as "wlmscpfs" protection->Remove(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID); protection->Remove(DICOM_TAG_SOP_INSTANCE_UID); } protection->ChangeEncoding(encoding_); answers_.push_back(protection.release()); } DicomFindAnswers::DicomFindAnswers(bool isWorklist) : encoding_(Configuration::GetDefaultEncoding()), isWorklist_(isWorklist), complete_(true) { } void DicomFindAnswers::SetEncoding(Encoding encoding) { for (size_t i = 0; i < answers_.size(); i++) { assert(answers_[i] != NULL); answers_[i]->ChangeEncoding(encoding); } encoding_ = encoding; } void DicomFindAnswers::SetWorklist(bool isWorklist) { if (answers_.empty()) { isWorklist_ = isWorklist; } else { // This set of answers is not empty anymore, cannot change its type throw OrthancException(ErrorCode_BadSequenceOfCalls); } } void DicomFindAnswers::Clear() { for (size_t i = 0; i < answers_.size(); i++) { assert(answers_[i] != NULL); delete answers_[i]; } answers_.clear(); } void DicomFindAnswers::Reserve(size_t size) { if (size > answers_.size()) { answers_.reserve(size); } } void DicomFindAnswers::Add(const DicomMap& map) { AddAnswerInternal(new ParsedDicomFile(map, encoding_)); } void DicomFindAnswers::Add(ParsedDicomFile& dicom) { AddAnswerInternal(dicom.Clone()); } void DicomFindAnswers::Add(const void* dicom, size_t size) { AddAnswerInternal(new ParsedDicomFile(dicom, size)); } ParsedDicomFile& DicomFindAnswers::GetAnswer(size_t index) const { if (index < answers_.size()) { return *answers_[index]; } else { throw OrthancException(ErrorCode_ParameterOutOfRange); } } DcmDataset* DicomFindAnswers::ExtractDcmDataset(size_t index) const { return new DcmDataset(*GetAnswer(index).GetDcmtkObject().getDataset()); } void DicomFindAnswers::ToJson(Json::Value& target, size_t index, bool simplify) const { DicomToJsonFormat format = (simplify ? DicomToJsonFormat_Human : DicomToJsonFormat_Full); GetAnswer(index).DatasetToJson(target, format, DicomToJsonFlags_None, 0); } void DicomFindAnswers::ToJson(Json::Value& target, bool simplify) const { target = Json::arrayValue; for (size_t i = 0; i < GetSize(); i++) { Json::Value answer; ToJson(answer, i, simplify); target.append(answer); } } }