thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 17:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83 from smi2/master

Browse Source 
Add CORS hearder,param:add_http_cors_header and check request header
This commit is contained in:
alexey-milovidov 2016-08-24 23:50:55 +04:00 committed by GitHub
commit 944c6270b9
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
View File

@ -35,7 +35,7 @@ class WriteBufferFromHTTPServerResponse : public BufferWithOwnMemory<WriteBuffer
{
private:
Poco::Net::HTTPServerResponse & response;
bool add_cors_header;
bool compress;
Poco::DeflatingStreamBuf::StreamType compression_method;
int compression_level = Z_DEFAULT_COMPRESSION;
@ -48,6 +48,11 @@ private:
{
if (!ostr)
{
if (add_cors_header)
{
response.set("Access-Control-Allow-Origin","*");
}
if (compress && offset()) /// Пустой ответ сжимать не нужно.
{
if (compression_method == Poco::DeflatingStreamBuf::STREAM_GZIP)
@ -120,6 +125,15 @@ public:
compression_level = level;
}
/** Включить или отключить CORS.
* Работает только перед тем, как были отправлены HTTP заголовки.
* Иначе - не имеет эффекта.
*/
void addHeaderCORS(bool enable_cors)
{
add_cors_header = enable_cors;
}
~WriteBufferFromHTTPServerResponse()
{
if (!offset())

6
dbms/include/DB/Interpreters/Settings.h
View File

@ -220,8 +220,10 @@ struct Settings
\
/** Write statistics about read rows, bytes, time elapsed in suitable output formats */ \
M(SettingBool, output_format_write_statistics, true) \
\
/** Write add http CORS header */ \
M(SettingBool, add_http_cors_header, false) \
/// Всевозможные ограничения на выполнение запроса.
Limits limits;

3
dbms/src/Server/HTTPHandler.cpp
View File

@ -246,6 +246,9 @@ void HTTPHandler::processQuery(
if (in_post_compressed && context.getSettingsRef().http_native_compression_disable_checksumming_on_decompress)
static_cast<CompressedReadBuffer &>(*in_post_maybe_compressed).disableChecksumming();
/// Добавить CORS header выставлена настройка, и если клиент передал заголовок Origin
used_output.out->addHeaderCORS( context.getSettingsRef().add_http_cors_header && !request.get("Origin", "").empty() );
context.setInterface(Context::Interface::HTTP);
Context::HTTPMethod http_method = Context::HTTPMethod::UNKNOWN;