Mercurial > hg > orthanc
annotate Core/Compression/ZlibCompressor.cpp @ 3506:d2b9981017c4
better handling of HTTP security
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 28 Aug 2019 15:19:04 +0200 |
| parents | 596cfabd72c5 |
| children | 94f4a18a79cc |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 59 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2954
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 136 | 11 * |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 0 | 23 * |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
34 #include "../PrecompiledHeaders.h" |
| 0 | 35 #include "ZlibCompressor.h" |
| 36 | |
| 1513 | 37 #include "../OrthancException.h" |
| 38 #include "../Logging.h" | |
| 39 | |
| 0 | 40 #include <stdio.h> |
| 41 #include <string.h> | |
| 42 #include <zlib.h> | |
| 43 | |
| 59 | 44 namespace Orthanc |
| 0 | 45 { |
| 46 void ZlibCompressor::Compress(std::string& compressed, | |
| 47 const void* uncompressed, | |
| 48 size_t uncompressedSize) | |
| 49 { | |
| 50 if (uncompressedSize == 0) | |
| 51 { | |
| 52 compressed.clear(); | |
| 53 return; | |
| 54 } | |
| 55 | |
|
3378
596cfabd72c5
Fixed a couple of truncation warnings
Benjamin Golinvaux <bgo@osimis.io>
parents:
3060
diff
changeset
|
56 uLongf compressedSize = compressBound(static_cast<uLong>(uncompressedSize)) |
|
596cfabd72c5
Fixed a couple of truncation warnings
Benjamin Golinvaux <bgo@osimis.io>
parents:
3060
diff
changeset
|
57 + 1024 /* security margin */; |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
58 if (compressedSize == 0) |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
59 { |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
60 compressedSize = 1; |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
61 } |
| 0 | 62 |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
63 uint8_t* target; |
| 1512 | 64 if (HasPrefixWithUncompressedSize()) |
| 0 | 65 { |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
66 compressed.resize(compressedSize + sizeof(uint64_t)); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
67 target = reinterpret_cast<uint8_t*>(&compressed[0]) + sizeof(uint64_t); |
| 0 | 68 } |
| 69 else | |
| 70 { | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
71 compressed.resize(compressedSize); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
72 target = reinterpret_cast<uint8_t*>(&compressed[0]); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
73 } |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
74 |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
75 int error = compress2(target, |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
76 &compressedSize, |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
77 const_cast<Bytef *>(static_cast<const Bytef *>(uncompressed)), |
|
3378
596cfabd72c5
Fixed a couple of truncation warnings
Benjamin Golinvaux <bgo@osimis.io>
parents:
3060
diff
changeset
|
78 static_cast<uLong>(uncompressedSize), |
| 1512 | 79 GetCompressionLevel()); |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
80 |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
81 if (error != Z_OK) |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
82 { |
| 0 | 83 compressed.clear(); |
| 84 | |
| 85 switch (error) | |
| 86 { | |
| 87 case Z_MEM_ERROR: | |
| 59 | 88 throw OrthancException(ErrorCode_NotEnoughMemory); |
| 0 | 89 |
| 90 default: | |
| 59 | 91 throw OrthancException(ErrorCode_InternalError); |
| 0 | 92 } |
| 93 } | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
94 |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
95 // The compression was successful |
| 1512 | 96 if (HasPrefixWithUncompressedSize()) |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
97 { |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
98 uint64_t s = static_cast<uint64_t>(uncompressedSize); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
99 memcpy(&compressed[0], &s, sizeof(uint64_t)); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
100 compressed.resize(compressedSize + sizeof(uint64_t)); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
101 } |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
102 else |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
103 { |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
104 compressed.resize(compressedSize); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
105 } |
| 0 | 106 } |
| 107 | |
| 108 | |
| 109 void ZlibCompressor::Uncompress(std::string& uncompressed, | |
| 110 const void* compressed, | |
| 111 size_t compressedSize) | |
| 112 { | |
| 113 if (compressedSize == 0) | |
| 114 { | |
| 115 uncompressed.clear(); | |
| 116 return; | |
| 117 } | |
| 118 | |
| 1513 | 119 if (!HasPrefixWithUncompressedSize()) |
| 0 | 120 { |
|
2954
d924f9bb61cc
taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
121 throw OrthancException(ErrorCode_InternalError, |
|
d924f9bb61cc
taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
122 "Cannot guess the uncompressed size of a zlib-encoded buffer"); |
| 0 | 123 } |
| 124 | |
| 1513 | 125 uint64_t uncompressedSize = ReadUncompressedSizePrefix(compressed, compressedSize); |
|
221
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
126 |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
127 try |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
128 { |
| 1545 | 129 uncompressed.resize(static_cast<size_t>(uncompressedSize)); |
|
221
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
130 } |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
131 catch (...) |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
132 { |
| 1513 | 133 throw OrthancException(ErrorCode_NotEnoughMemory); |
|
221
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
134 } |
| 0 | 135 |
| 1545 | 136 uLongf tmp = static_cast<uLongf>(uncompressedSize); |
| 0 | 137 int error = uncompress |
| 138 (reinterpret_cast<uint8_t*>(&uncompressed[0]), | |
| 139 &tmp, | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
140 reinterpret_cast<const uint8_t*>(compressed) + sizeof(uint64_t), |
|
3378
596cfabd72c5
Fixed a couple of truncation warnings
Benjamin Golinvaux <bgo@osimis.io>
parents:
3060
diff
changeset
|
141 static_cast<uLong>(compressedSize - sizeof(uint64_t))); |
| 0 | 142 |
| 143 if (error != Z_OK) | |
| 144 { | |
| 145 uncompressed.clear(); | |
| 146 | |
| 147 switch (error) | |
| 148 { | |
| 149 case Z_DATA_ERROR: | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1545
diff
changeset
|
150 throw OrthancException(ErrorCode_CorruptedFile); |
| 0 | 151 |
| 152 case Z_MEM_ERROR: | |
| 59 | 153 throw OrthancException(ErrorCode_NotEnoughMemory); |
| 0 | 154 |
| 155 default: | |
| 59 | 156 throw OrthancException(ErrorCode_InternalError); |
| 0 | 157 } |
| 158 } | |
| 159 } | |
| 160 } |