Mercurial > hg > orthanc
view Plugins/Samples/Common/FullOrthancDataset.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 | fd5869e3ed5e |
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 "FullOrthancDataset.h" #include "OrthancPluginException.h" #include <stdio.h> #include <cassert> namespace OrthancPlugins { static const Json::Value* AccessTag(const Json::Value& dataset, const DicomTag& tag) { if (dataset.type() != Json::objectValue) { ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); } char name[16]; sprintf(name, "%04x,%04x", tag.GetGroup(), tag.GetElement()); if (!dataset.isMember(name)) { return NULL; } const Json::Value& value = dataset[name]; if (value.type() != Json::objectValue || !value.isMember("Name") || !value.isMember("Type") || !value.isMember("Value") || value["Name"].type() != Json::stringValue || value["Type"].type() != Json::stringValue) { ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); } return &value; } static const Json::Value& GetSequenceContent(const Json::Value& sequence) { assert(sequence.type() == Json::objectValue); assert(sequence.isMember("Type")); assert(sequence.isMember("Value")); const Json::Value& value = sequence["Value"]; if (sequence["Type"].asString() != "Sequence" || value.type() != Json::arrayValue) { ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); } else { return value; } } static bool GetStringInternal(std::string& result, const Json::Value& tag) { assert(tag.type() == Json::objectValue); assert(tag.isMember("Type")); assert(tag.isMember("Value")); const Json::Value& value = tag["Value"]; if (tag["Type"].asString() != "String" || value.type() != Json::stringValue) { ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); } else { result = value.asString(); return true; } } const Json::Value* FullOrthancDataset::LookupPath(const DicomPath& path) const { const Json::Value* content = &root_; for (unsigned int depth = 0; depth < path.GetPrefixLength(); depth++) { const Json::Value* sequence = AccessTag(*content, path.GetPrefixTag(depth)); if (sequence == NULL) { return NULL; } const Json::Value& nextContent = GetSequenceContent(*sequence); size_t index = path.GetPrefixIndex(depth); if (index >= nextContent.size()) { return NULL; } else { content = &nextContent[static_cast<Json::Value::ArrayIndex>(index)]; } } return AccessTag(*content, path.GetFinalTag()); } void FullOrthancDataset::CheckRoot() const { if (root_.type() != Json::objectValue) { ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat); } } FullOrthancDataset::FullOrthancDataset(IOrthancConnection& orthanc, const std::string& uri) { IOrthancConnection::RestApiGet(root_, orthanc, uri); CheckRoot(); } FullOrthancDataset::FullOrthancDataset(const std::string& content) { IOrthancConnection::ParseJson(root_, content); CheckRoot(); } bool FullOrthancDataset::GetStringValue(std::string& result, const DicomPath& path) const { const Json::Value* value = LookupPath(path); if (value == NULL) { return false; } else { return GetStringInternal(result, *value); } } bool FullOrthancDataset::GetSequenceSize(size_t& size, const DicomPath& path) const { const Json::Value* sequence = LookupPath(path); if (sequence == NULL) { return false; } else { size = GetSequenceContent(*sequence).size(); return true; } } }