simon987/sist2
1
0
Fork 0
mirror of https://github.com/simon987/sist2.git synced 2025-04-19 18:26:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #157 from simon987/mongoose-7

Browse Source 
Update to mongoose 7.x, change Docker build
This commit is contained in:
simon987 2021-05-05 14:18:36 -04:00 committed by GitHub
commit 5f657d61b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 167 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.dockerignore Normal file
View File

@ -0,0 +1,23 @@
.idea
*/thumbs
*.cbp
CMakeCache.txt
CMakeFiles
cmake-build-debug
cmake_install.cmake
Makefile
*.out
LOG
sist2*
index.sist2/
bundle*.css
bundle.js
**/*.a
**/vgcore.*
build/
.git/
third-party/libscan/libscan-test-files/
**/ext_ffmpeg
**/ext_libmobi
**/scan_a_test
Dockerfile

18
.drone.yml
View File

@ -11,6 +11,21 @@ steps:
image: simon987/ubuntu_ci image: simon987/ubuntu_ci
commands: commands:
- ./ci/build.sh - ./ci/build.sh
- name: docker
image: plugins/docker
settings:
username:
from_secret: DOCKER_USER
password:
from_secret: DOCKER_PASSWORD
repo: simon987/sist2
context: ./Docker/
dockerfile: ./Docker/Dockerfile
auto_tag: true
auto_tag_suffix: x64-linux
when:
event:
- tag
- name: scp files - name: scp files
image: appleboy/drone-scp image: appleboy/drone-scp
settings: settings:
@ -24,6 +39,7 @@ steps:
from_secret: SSH_KEY from_secret: SSH_KEY
target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/ target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
source: source:
- ./VERSION
- ./sist2-x64-linux - ./sist2-x64-linux
- ./sist2-x64-linux-debug.tar.gz - ./sist2-x64-linux-debug.tar.gz
@ -51,6 +67,6 @@ steps:
from_secret: SSH_USER from_secret: SSH_USER
key: key:
from_secret: SSH_KEY from_secret: SSH_KEY
target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/ target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
source: source:
- ./sist2-arm64-linux - ./sist2-arm64-linux

12
CMakeLists.txt
View File

@ -5,7 +5,7 @@ project(sist2 C)
option(SIST_DEBUG "Build a debug executable" on) option(SIST_DEBUG "Build a debug executable" on)
set(BUILD_TESTS off) set(BUILD_TESTS on)
add_subdirectory(third-party/libscan) add_subdirectory(third-party/libscan)
set(ARGPARSE_SHARED off) set(ARGPARSE_SHARED off)
add_subdirectory(third-party/argparse) add_subdirectory(third-party/argparse)
@ -36,14 +36,15 @@ add_executable(sist2
target_link_directories(sist2 PRIVATE BEFORE ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/) target_link_directories(sist2 PRIVATE BEFORE ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/)
set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib) set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
find_package(PkgConfig REQUIRED)
pkg_search_module(GLIB REQUIRED glib-2.0)
find_package(lmdb CONFIG REQUIRED) find_package(lmdb CONFIG REQUIRED)
find_package(cJSON CONFIG REQUIRED) find_package(cJSON CONFIG REQUIRED)
find_package(unofficial-glib CONFIG REQUIRED)
find_package(unofficial-mongoose CONFIG REQUIRED) find_package(unofficial-mongoose CONFIG REQUIRED)
find_package(CURL CONFIG REQUIRED) find_package(CURL CONFIG REQUIRED)
#find_package(OpenSSL REQUIRED)
target_include_directories( target_include_directories(
sist2 PUBLIC sist2 PUBLIC
@ -51,6 +52,7 @@ target_include_directories(
${CMAKE_SOURCE_DIR}/third-party/utf8.h/ ${CMAKE_SOURCE_DIR}/third-party/utf8.h/
${CMAKE_SOURCE_DIR}/third-party/libscan/ ${CMAKE_SOURCE_DIR}/third-party/libscan/
${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/
${GLIB_INCLUDE_DIRS}
) )
target_compile_options( target_compile_options(
@ -103,7 +105,7 @@ target_link_libraries(
lmdb lmdb
cjson cjson
argparse argparse
unofficial::glib::glib ${GLIB_LDFLAGS}
unofficial::mongoose::mongoose unofficial::mongoose::mongoose
CURL::libcurl CURL::libcurl

14
Docker/build.sh
View File

@ -1,14 +0,0 @@
rm ./sist2 sist2_debug
cp ../sist2.gz .
gzip -d sist2.gz
strip sist2
version=$(./sist2 --version)
echo "Version ${version}"
docker build . -t simon987/sist2:${version} -t simon987/sist2:latest
docker push simon987/sist2:${version}
docker push simon987/sist2:latest
docker run --rm simon987/sist2 -v

22
DockerArm64/Dockerfile
View File

@ -1,22 +0,0 @@
FROM ubuntu:19.10
MAINTAINER simon987 <me@simon987.net>
RUN apt update
RUN apt install -y libglib2.0-0 libcurl4 libmagic1 libharfbuzz-bin libopenjp2-7 libarchive13 liblzma5 libzstd1 liblz4-1 \
curl libtiff5 libpng16-16 libpcre3
RUN mkdir -p /usr/share/tessdata && \
cd /usr/share/tessdata/ && \
curl -o /usr/share/tessdata/hin.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/hin.traineddata &&\
curl -o /usr/share/tessdata/jpn.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/jpn.traineddata &&\
curl -o /usr/share/tessdata/eng.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/eng.traineddata &&\
curl -o /usr/share/tessdata/fra.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/fra.traineddata &&\
curl -o /usr/share/tessdata/rus.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/rus.traineddata &&\
curl -o /usr/share/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata && ls -lh
ADD sist2_arm64 /root/sist2
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENTRYPOINT ["/root/sist2"]

13
DockerArm64/build.sh
View File

@ -1,13 +0,0 @@
rm ./sist2_arm64
cp ../sist2_arm64.gz .
gzip -d sist2_arm64.gz
version=$(./sist2_arm64 --version)
echo "Version ${version}"
docker build . -t simon987/sist2-arm64:"${version}" -t simon987/sist2-arm64:latest
docker push simon987/sist2-arm64:"${version}"
docker push simon987/sist2-arm64:latest
docker run --rm simon987/sist2-arm64 -v

14
Docker/Dockerfile → Dockerfile
View File

@ -1,6 +1,14 @@
FROM ubuntu:19.10 FROM simon987/sist2-build as build
MAINTAINER simon987 <me@simon987.net> MAINTAINER simon987 <me@simon987.net>
WORKDIR /build/
ADD . /build/
RUN cmake -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .
RUN make -j$(nproc)
RUN strip sist2
FROM ubuntu:20.10
RUN apt update RUN apt update
RUN apt install -y libglib2.0-0 libcurl4 libmagic1 libharfbuzz-bin libopenjp2-7 libarchive13 liblzma5 libzstd1 liblz4-1 \ RUN apt install -y libglib2.0-0 libcurl4 libmagic1 libharfbuzz-bin libopenjp2-7 libarchive13 liblzma5 libzstd1 liblz4-1 \
curl libtiff5 libpng16-16 libpcre3 curl libtiff5 libpng16-16 libpcre3
@ -12,9 +20,9 @@ RUN mkdir -p /usr/share/tessdata && \
curl -o /usr/share/tessdata/eng.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/eng.traineddata &&\ curl -o /usr/share/tessdata/eng.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/eng.traineddata &&\
curl -o /usr/share/tessdata/fra.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/fra.traineddata &&\ curl -o /usr/share/tessdata/fra.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/fra.traineddata &&\
curl -o /usr/share/tessdata/rus.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/rus.traineddata &&\ curl -o /usr/share/tessdata/rus.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/rus.traineddata &&\
curl -o /usr/share/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata && ls -lh curl -o /usr/share/tessdata/spa.traineddata https://raw.githubusercontent.com/tesseract-ocr/tessdata/master/spa.traineddata
ADD sist2 /root/sist2 COPY --from=build /build/sist2 /root/sist2
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8 ENV LC_ALL C.UTF-8

1
Dockerfile.arm64 Normal file
View File

@ -0,0 +1 @@
# TODO

2
ci/build.sh
View File

@ -10,6 +10,8 @@ rm -rf CMakeFiles CMakeCache.txt
cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" . cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
make -j 33 make -j 33
strip sist2 strip sist2
./sist2 -v > VERSION
cp sist2 Docker/
mv sist2 sist2-x64-linux mv sist2 sist2-x64-linux
rm -rf CMakeFiles CMakeCache.txt rm -rf CMakeFiles CMakeCache.txt

1
src/cli.c
View File

@ -227,6 +227,7 @@ int scan_args_validate(scan_args_t *args, int argc, const char **argv) {
LOG_DEBUGF("cli.c", "arg depth=%d", args->depth) LOG_DEBUGF("cli.c", "arg depth=%d", args->depth)
LOG_DEBUGF("cli.c", "arg path=%s", args->path) LOG_DEBUGF("cli.c", "arg path=%s", args->path)
LOG_DEBUGF("cli.c", "arg archive=%s", args->archive) LOG_DEBUGF("cli.c", "arg archive=%s", args->archive)
LOG_DEBUGF("cli.c", "arg archive_passphrase=%s", args->archive_passphrase)
LOG_DEBUGF("cli.c", "arg tesseract_lang=%s", args->tesseract_lang) LOG_DEBUGF("cli.c", "arg tesseract_lang=%s", args->tesseract_lang)
LOG_DEBUGF("cli.c", "arg tesseract_path=%s", args->tesseract_path) LOG_DEBUGF("cli.c", "arg tesseract_path=%s", args->tesseract_path)
LOG_DEBUGF("cli.c", "arg exclude=%s", args->exclude_regex) LOG_DEBUGF("cli.c", "arg exclude=%s", args->exclude_regex)

1
src/cli.h
View File

@ -18,6 +18,7 @@ typedef struct scan_args {
char *path; char *path;
char *archive; char *archive;
archive_mode_t archive_mode; archive_mode_t archive_mode;
char *archive_passphrase;
char *tesseract_lang; char *tesseract_lang;
const char *tesseract_path; const char *tesseract_path;
char *exclude_regex; char *exclude_regex;

5
src/main.c
View File

@ -21,7 +21,7 @@
#define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0" #define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0"
static const char *const Version = "2.9.0"; static const char *const Version = "2.9.1";
static const char *const usage[] = { static const char *const usage[] = {
"sist2 scan [OPTION]... PATH", "sist2 scan [OPTION]... PATH",
"sist2 index [OPTION]... INDEX", "sist2 index [OPTION]... INDEX",
@ -99,6 +99,7 @@ void initialize_scan_context(scan_args_t *args) {
ScanCtx.arc_ctx.log = _log; ScanCtx.arc_ctx.log = _log;
ScanCtx.arc_ctx.logf = _logf; ScanCtx.arc_ctx.logf = _logf;
ScanCtx.arc_ctx.parse = (parse_callback_t) parse; ScanCtx.arc_ctx.parse = (parse_callback_t) parse;
memset(ScanCtx.arc_ctx.passphrase, 0, sizeof(ScanCtx.arc_ctx.passphrase));
// Comic // Comic
ScanCtx.comic_ctx.log = _log; ScanCtx.comic_ctx.log = _log;
@ -440,6 +441,8 @@ int main(int argc, const char *argv[]) {
OPT_STRING(0, "archive", &scan_args->archive, "Archive file mode (skip|list|shallow|recurse). " OPT_STRING(0, "archive", &scan_args->archive, "Archive file mode (skip|list|shallow|recurse). "
"skip: Don't parse, list: only get file names as text, " "skip: Don't parse, list: only get file names as text, "
"shallow: Don't parse archives inside archives. DEFAULT: recurse"), "shallow: Don't parse archives inside archives. DEFAULT: recurse"),
OPT_STRING(0, "archive-passphrase", &scan_args->archive_passphrase, "Passphrase for encrypted archive files"),
OPT_STRING(0, "ocr", &scan_args->tesseract_lang, "Tesseract language (use tesseract --list-langs to see " OPT_STRING(0, "ocr", &scan_args->tesseract_lang, "Tesseract language (use tesseract --list-langs to see "
"which are installed on your machine)"), "which are installed on your machine)"),
OPT_STRING('e', "exclude", &scan_args->exclude_regex, "Files that match this regex will not be scanned"), OPT_STRING('e', "exclude", &scan_args->exclude_regex, "Files that match this regex will not be scanned"),

2
src/static/search.html
View File

@ -12,7 +12,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/">sist2</a> <a class="navbar-brand" href="/">sist2</a>
<span class="badge badge-pill version">2.9.0</span> <span class="badge badge-pill version">2.9.1</span>
<span class="tagline">Lightning-fast file system indexer and search tool </span> <span class="tagline">Lightning-fast file system indexer and search tool </span>
<a class="btn ml-auto" href="stats">Stats</a> <a class="btn ml-auto" href="stats">Stats</a>
<button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings <button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings

2
src/static/stats.html
View File

@ -10,7 +10,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/">sist2</a> <a class="navbar-brand" href="/">sist2</a>
<span class="badge badge-pill version">2.9.0</span> <span class="badge badge-pill version">2.9.1</span>
<span class="tagline">Lightning-fast file system indexer and search tool </span> <span class="tagline">Lightning-fast file system indexer and search tool </span>
<a style="margin-left: auto" class="btn" href="/">Back</a> <a style="margin-left: auto" class="btn" href="/">Back</a>
<button class="btn" type="button" data-toggle="modal" data-target="#settings" <button class="btn" type="button" data-toggle="modal" data-target="#settings"

266
src/web/serve.c
View File

@ -8,18 +8,8 @@
#include <src/ctx.h> #include <src/ctx.h>
#include <mongoose.h>
static void send_response_line(struct mg_connection *nc, int status_code, size_t length, char *extra_headers) {
static int has_prefix(const struct mg_str *str, const struct mg_str *prefix) {
return str->len > prefix->len && memcmp(str->p, prefix->p, prefix->len) == 0;
}
static int is_equal(const struct mg_str *s1, const struct mg_str *s2) {
return s1->len == s2->len && memcmp(s1->p, s2->p, s2->len) == 0;
}
static void send_response_line(struct mg_connection *nc, int status_code, int length, char *extra_headers) {
mg_printf( mg_printf(
nc, nc,
"HTTP/1.1 %d %s\r\n" "HTTP/1.1 %d %s\r\n"
@ -62,36 +52,32 @@ store_t *get_tag_store(const char *index_id) {
void search_index(struct mg_connection *nc) { void search_index(struct mg_connection *nc) {
send_response_line(nc, 200, sizeof(search_html), "Content-Type: text/html"); send_response_line(nc, 200, sizeof(search_html), "Content-Type: text/html");
mg_send(nc, search_html, sizeof(search_html)); mg_send(nc, search_html, sizeof(search_html));
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void stats(struct mg_connection *nc) { void stats(struct mg_connection *nc) {
send_response_line(nc, 200, sizeof(stats_html), "Content-Type: text/html"); send_response_line(nc, 200, sizeof(stats_html), "Content-Type: text/html");
mg_send(nc, stats_html, sizeof(stats_html)); mg_send(nc, stats_html, sizeof(stats_html));
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void stats_files(struct mg_connection *nc, struct http_message *hm, struct mg_str *path) { void stats_files(struct mg_connection *nc, struct mg_http_message *hm) {
if (path->len != MD5_STR_LENGTH + 4) { if (hm->uri.len != MD5_STR_LENGTH + 4) {
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char arg_md5[MD5_STR_LENGTH]; char arg_md5[MD5_STR_LENGTH];
memcpy(arg_md5, hm->uri.p + 3, MD5_STR_LENGTH); memcpy(arg_md5, hm->uri.ptr + 3, MD5_STR_LENGTH);
*(arg_md5 + MD5_STR_LENGTH - 1) = '\0'; *(arg_md5 + MD5_STR_LENGTH - 1) = '\0';
index_t *index = get_index_by_id(arg_md5); index_t *index = get_index_by_id(arg_md5);
if (index == NULL) { if (index == NULL) {
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
const char *file; const char *file;
switch (atoi(hm->uri.p + 3 + MD5_STR_LENGTH)) { switch (atoi(hm->uri.ptr + 3 + MD5_STR_LENGTH)) {
case 1: case 1:
file = "treemap.csv"; file = "treemap.csv";
break; break;
@ -105,7 +91,6 @@ void stats_files(struct mg_connection *nc, struct http_message *hm, struct mg_st
file = "date_agg.csv"; file = "date_agg.csv";
break; break;
default: default:
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
@ -116,43 +101,31 @@ void stats_files(struct mg_connection *nc, struct http_message *hm, struct mg_st
strcpy(full_path, index->path); strcpy(full_path, index->path);
strcat(full_path, file); strcat(full_path, file);
mg_http_serve_file(nc, hm, full_path, mg_mk_str("text/csv"), mg_mk_str(disposition)); mg_http_serve_file(nc, hm, full_path, "text/csv", disposition);
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void javascript_lib(struct mg_connection *nc) { void javascript_lib(struct mg_connection *nc) {
send_response_line(nc, 200, sizeof(bundle_js), "Content-Type: application/javascript"); send_response_line(nc, 200, sizeof(bundle_js), "Content-Type: application/javascript");
mg_send(nc, bundle_js, sizeof(bundle_js)); mg_send(nc, bundle_js, sizeof(bundle_js));
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void javascript_search(struct mg_connection *nc) { void javascript_search(struct mg_connection *nc) {
send_response_line(nc, 200, sizeof(search_js), "Content-Type: application/javascript"); send_response_line(nc, 200, sizeof(search_js), "Content-Type: application/javascript");
mg_send(nc, search_js, sizeof(search_js)); mg_send(nc, search_js, sizeof(search_js));
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
int client_requested_dark_theme(struct http_message *hm) { int client_requested_dark_theme(struct mg_http_message *hm) {
struct mg_str *cookie_header = mg_get_http_header(hm, "cookie"); struct mg_str *cookie_header = mg_http_get_header(hm, "cookie");
if (cookie_header == NULL) { if (cookie_header == NULL) {
return FALSE; return FALSE;
} }
char buf[4096]; struct mg_str sist_cookie = mg_http_get_header_var(*cookie_header, mg_str_n("sist", 4));
char *sist_cookie = buf;
if (mg_http_parse_header2(cookie_header, "sist", &sist_cookie, sizeof(buf)) == 0) { return mg_strcmp(sist_cookie, mg_str_n("dark", 4)) == 0;
return FALSE;
} }
int ret = strcmp(sist_cookie, "dark") == 0; void style(struct mg_connection *nc, struct mg_http_message *hm) {
if (sist_cookie != buf) {
free(sist_cookie);
}
return ret;
}
void style(struct mg_connection *nc, struct http_message *hm) {
if (client_requested_dark_theme(hm)) { if (client_requested_dark_theme(hm)) {
send_response_line(nc, 200, sizeof(bundle_dark_css), "Content-Type: text/css"); send_response_line(nc, 200, sizeof(bundle_dark_css), "Content-Type: text/css");
@ -161,11 +134,9 @@ void style(struct mg_connection *nc, struct http_message *hm) {
send_response_line(nc, 200, sizeof(bundle_css), "Content-Type: text/css"); send_response_line(nc, 200, sizeof(bundle_css), "Content-Type: text/css");
mg_send(nc, bundle_css, sizeof(bundle_css)); mg_send(nc, bundle_css, sizeof(bundle_css));
} }
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void img_sprite_skin_flat(struct mg_connection *nc, struct http_message *hm) { void img_sprite_skin_flat(struct mg_connection *nc, struct mg_http_message *hm) {
if (client_requested_dark_theme(hm)) { if (client_requested_dark_theme(hm)) {
send_response_line(nc, 200, sizeof(sprite_skin_flat_dark_png), "Content-Type: image/png"); send_response_line(nc, 200, sizeof(sprite_skin_flat_dark_png), "Content-Type: image/png");
mg_send(nc, sprite_skin_flat_dark_png, sizeof(sprite_skin_flat_dark_png)); mg_send(nc, sprite_skin_flat_dark_png, sizeof(sprite_skin_flat_dark_png));
@ -173,25 +144,22 @@ void img_sprite_skin_flat(struct mg_connection *nc, struct http_message *hm) {
send_response_line(nc, 200, sizeof(sprite_skin_flat_png), "Content-Type: image/png"); send_response_line(nc, 200, sizeof(sprite_skin_flat_png), "Content-Type: image/png");
mg_send(nc, sprite_skin_flat_png, sizeof(sprite_skin_flat_png)); mg_send(nc, sprite_skin_flat_png, sizeof(sprite_skin_flat_png));
} }
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void thumbnail(struct mg_connection *nc, struct http_message *hm, struct mg_str *path) { void thumbnail(struct mg_connection *nc, struct mg_http_message *hm) {
if (path->len != 68) { if (hm->uri.len != 68) {
LOG_DEBUGF("serve.c", "Invalid thumbnail path: %.*s", (int) path->len, path->p) LOG_DEBUGF("serve.c", "Invalid thumbnail path: %.*s", (int) hm->uri.len, hm->uri.ptr)
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char arg_file_md5[MD5_STR_LENGTH]; char arg_file_md5[MD5_STR_LENGTH];
char arg_index[MD5_STR_LENGTH]; char arg_index[MD5_STR_LENGTH];
memcpy(arg_index, hm->uri.p + 3, MD5_STR_LENGTH); memcpy(arg_index, hm->uri.ptr + 3, MD5_STR_LENGTH);
*(arg_index + MD5_STR_LENGTH - 1) = '\0'; *(arg_index + MD5_STR_LENGTH - 1) = '\0';
memcpy(arg_file_md5, hm->uri.p + 3 + MD5_STR_LENGTH, MD5_STR_LENGTH); memcpy(arg_file_md5, hm->uri.ptr + 3 + MD5_STR_LENGTH, MD5_STR_LENGTH);
*(arg_file_md5 + MD5_STR_LENGTH - 1) = '\0'; *(arg_file_md5 + MD5_STR_LENGTH - 1) = '\0';
unsigned char md5_buf[MD5_DIGEST_LENGTH]; unsigned char md5_buf[MD5_DIGEST_LENGTH];
@ -200,8 +168,7 @@ void thumbnail(struct mg_connection *nc, struct http_message *hm, struct mg_str
store_t *store = get_store(arg_index); store_t *store = get_store(arg_index);
if (store == NULL) { if (store == NULL) {
LOG_DEBUGF("serve.c", "Could not get store for index: %s", arg_index) LOG_DEBUGF("serve.c", "Could not get store for index: %s", arg_index)
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
@ -212,26 +179,24 @@ void thumbnail(struct mg_connection *nc, struct http_message *hm, struct mg_str
mg_send(nc, data, data_len); mg_send(nc, data, data_len);
free(data); free(data);
} }
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void search(struct mg_connection *nc, struct http_message *hm) { void search(struct mg_connection *nc, struct mg_http_message *hm) {
if (hm->body.len == 0) { if (hm->body.len == 0) {
LOG_DEBUG("serve.c", "Client sent empty body, ignoring request") LOG_DEBUG("serve.c", "Client sent empty body, ignoring request")
mg_http_send_error(nc, 500, NULL); mg_http_reply(nc, 500, "", "Invalid request");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char *body = malloc(hm->body.len + 1); char *body = malloc(hm->body.len + 1);
memcpy(body, hm->body.p, hm->body.len); memcpy(body, hm->body.ptr, hm->body.len);
*(body + hm->body.len) = '\0'; *(body + hm->body.len) = '\0';
char url[4096]; char url[4096];
snprintf(url, 4096, "%s/%s/_search", WebCtx.es_url, WebCtx.es_index); snprintf(url, 4096, "%s/%s/_search", WebCtx.es_url, WebCtx.es_index);
nc->user_data = web_post_async(url, body); nc->fn_data = web_post_async(url, body);
} }
void serve_file_from_url(cJSON *json, index_t *idx, struct mg_connection *nc) { void serve_file_from_url(cJSON *json, index_t *idx, struct mg_connection *nc) {
@ -253,16 +218,13 @@ void serve_file_from_url(cJSON *json, index_t *idx, struct mg_connection *nc) {
idx->desc.rewrite_url, path_unescaped, name_unescaped, strlen(ext) == 0 ? "" : ".", ext); idx->desc.rewrite_url, path_unescaped, name_unescaped, strlen(ext) == 0 ? "" : ".", ext);
dyn_buffer_t encoded = url_escape(url); dyn_buffer_t encoded = url_escape(url);
mg_http_send_redirect( dyn_buffer_write_char(&encoded, '\0');
nc, 308,
(struct mg_str) MG_MK_STR_N(encoded.buf, encoded.cur), mg_http_reply(nc, 308, "Location: %s", encoded.buf);
(struct mg_str) MG_NULL_STR
);
dyn_buffer_destroy(&encoded); dyn_buffer_destroy(&encoded);
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void serve_file_from_disk(cJSON *json, index_t *idx, struct mg_connection *nc, struct http_message *hm) { void serve_file_from_disk(cJSON *json, index_t *idx, struct mg_connection *nc, struct mg_http_message *hm) {
const char *path = cJSON_GetObjectItem(json, "path")->valuestring; const char *path = cJSON_GetObjectItem(json, "path")->valuestring;
const char *name = cJSON_GetObjectItem(json, "name")->valuestring; const char *name = cJSON_GetObjectItem(json, "name")->valuestring;
@ -286,7 +248,7 @@ void serve_file_from_disk(cJSON *json, index_t *idx, struct mg_connection *nc, s
snprintf(disposition, sizeof(disposition), "Content-Disposition: inline; filename=\"%s%s%s\"", snprintf(disposition, sizeof(disposition), "Content-Disposition: inline; filename=\"%s%s%s\"",
name, strlen(ext) == 0 ? "" : ".", ext); name, strlen(ext) == 0 ? "" : ".", ext);
mg_http_serve_file(nc, hm, full_path, mg_mk_str(mime), mg_mk_str(disposition)); mg_http_serve_file(nc, hm, full_path, mime, "");
} }
void index_info(struct mg_connection *nc) { void index_info(struct mg_connection *nc) {
@ -310,22 +272,19 @@ void index_info(struct mg_connection *nc) {
mg_send(nc, json_str, strlen(json_str)); mg_send(nc, json_str, strlen(json_str));
free(json_str); free(json_str);
cJSON_Delete(json); cJSON_Delete(json);
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void document_info(struct mg_connection *nc, struct http_message *hm, struct mg_str *path) { void document_info(struct mg_connection *nc, struct mg_http_message *hm) {
if (path->len != MD5_STR_LENGTH + 2) { if (hm->uri.len != MD5_STR_LENGTH + 2) {
LOG_DEBUGF("serve.c", "Invalid document_info path: %.*s", (int) path->len, path->p) LOG_DEBUGF("serve.c", "Invalid document_info path: %.*s", (int) hm->uri.len, hm->uri.ptr)
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char arg_md5[MD5_STR_LENGTH]; char arg_md5[MD5_STR_LENGTH];
memcpy(arg_md5, hm->uri.p + 3, MD5_STR_LENGTH); memcpy(arg_md5, hm->uri.ptr + 3, MD5_STR_LENGTH);
*(arg_md5 + MD5_STR_LENGTH - 1) = '\0'; *(arg_md5 + MD5_STR_LENGTH - 1) = '\0';
cJSON *doc = elastic_get_document(arg_md5); cJSON *doc = elastic_get_document(arg_md5);
@ -334,16 +293,14 @@ void document_info(struct mg_connection *nc, struct http_message *hm, struct mg_
cJSON *index_id = cJSON_GetObjectItem(source, "index"); cJSON *index_id = cJSON_GetObjectItem(source, "index");
if (index_id == NULL) { if (index_id == NULL) {
cJSON_Delete(doc); cJSON_Delete(doc);
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
index_t *idx = get_index_by_id(index_id->valuestring); index_t *idx = get_index_by_id(index_id->valuestring);
if (idx == NULL) { if (idx == NULL) {
cJSON_Delete(doc); cJSON_Delete(doc);
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
@ -352,21 +309,18 @@ void document_info(struct mg_connection *nc, struct http_message *hm, struct mg_
mg_send(nc, json_str, (int) strlen(json_str)); mg_send(nc, json_str, (int) strlen(json_str));
free(json_str); free(json_str);
cJSON_Delete(doc); cJSON_Delete(doc);
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
void file(struct mg_connection *nc, struct http_message *hm, struct mg_str *path) { void file(struct mg_connection *nc, struct mg_http_message *hm) {
if (path->len != MD5_STR_LENGTH + 2) { if (hm->uri.len != MD5_STR_LENGTH + 2) {
LOG_DEBUGF("serve.c", "Invalid file path: %.*s", (int) path->len, path->p) LOG_DEBUGF("serve.c", "Invalid file path: %.*s", (int) hm->uri.len, hm->uri.ptr)
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char arg_md5[MD5_STR_LENGTH]; char arg_md5[MD5_STR_LENGTH];
memcpy(arg_md5, hm->uri.p + 3, MD5_STR_LENGTH); memcpy(arg_md5, hm->uri.ptr + 3, MD5_STR_LENGTH);
*(arg_md5 + MD5_STR_LENGTH - 1) = '\0'; *(arg_md5 + MD5_STR_LENGTH - 1) = '\0';
const char *next = arg_md5; const char *next = arg_md5;
@ -380,8 +334,7 @@ void file(struct mg_connection *nc, struct http_message *hm, struct mg_str *path
index_id = cJSON_GetObjectItem(source, "index"); index_id = cJSON_GetObjectItem(source, "index");
if (index_id == NULL) { if (index_id == NULL) {
cJSON_Delete(doc); cJSON_Delete(doc);
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
cJSON *parent = cJSON_GetObjectItem(source, "parent"); cJSON *parent = cJSON_GetObjectItem(source, "parent");
@ -395,8 +348,7 @@ void file(struct mg_connection *nc, struct http_message *hm, struct mg_str *path
if (idx == NULL) { if (idx == NULL) {
cJSON_Delete(doc); cJSON_Delete(doc);
nc->flags |= MG_F_SEND_AND_CLOSE; mg_http_reply(nc, 404, "", "Not found");
mg_http_send_error(nc, 404, NULL);
return; return;
} }
@ -417,8 +369,6 @@ void status(struct mg_connection *nc) {
} }
free(status); free(status);
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
typedef struct { typedef struct {
@ -464,35 +414,32 @@ tag_req_t *parse_tag_request(cJSON *json) {
return req; return req;
} }
void tag(struct mg_connection *nc, struct http_message *hm, struct mg_str *path) { void tag(struct mg_connection *nc, struct mg_http_message *hm) {
if (path->len != MD5_STR_LENGTH + 4) { if (hm->uri.len != MD5_STR_LENGTH + 4) {
LOG_DEBUGF("serve.c", "Invalid tag path: %.*s", (int) path->len, path->p) LOG_DEBUGF("serve.c", "Invalid tag path: %.*s", (int) hm->uri.len, hm->uri.ptr)
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char arg_index[MD5_STR_LENGTH]; char arg_index[MD5_STR_LENGTH];
memcpy(arg_index, hm->uri.p + 5, MD5_STR_LENGTH); memcpy(arg_index, hm->uri.ptr + 5, MD5_STR_LENGTH);
*(arg_index + MD5_STR_LENGTH - 1) = '\0'; *(arg_index + MD5_STR_LENGTH - 1) = '\0';
if (hm->body.len < 2 || hm->method.len != 4 || memcmp(&hm->method, "POST", 4) == 0) { if (hm->body.len < 2 || hm->method.len != 4 || memcmp(&hm->method, "POST", 4) == 0) {
LOG_DEBUG("serve.c", "Invalid tag request") LOG_DEBUG("serve.c", "Invalid tag request")
mg_http_send_error(nc, 400, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
store_t *store = get_tag_store(arg_index); store_t *store = get_tag_store(arg_index);
if (store == NULL) { if (store == NULL) {
LOG_DEBUGF("serve.c", "Could not get tag store for index: %s", arg_index) LOG_DEBUGF("serve.c", "Could not get tag store for index: %s", arg_index)
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
char *body = malloc(hm->body.len + 1); char *body = malloc(hm->body.len + 1);
memcpy(body, hm->body.p, hm->body.len); memcpy(body, hm->body.ptr, hm->body.len);
*(body + hm->body.len) = '\0'; *(body + hm->body.len) = '\0';
cJSON *json = cJSON_Parse(body); cJSON *json = cJSON_Parse(body);
@ -501,8 +448,7 @@ void tag(struct mg_connection *nc, struct http_message *hm, struct mg_str *path)
LOG_DEBUGF("serve.c", "Could not parse tag request", arg_index) LOG_DEBUGF("serve.c", "Could not parse tag request", arg_index)
cJSON_Delete(json); cJSON_Delete(json);
free(body); free(body);
mg_http_send_error(nc, 400, NULL); mg_http_reply(nc, 400, "", "Invalid request");
nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
@ -545,7 +491,7 @@ void tag(struct mg_connection *nc, struct http_message *hm, struct mg_str *path)
char url[4096]; char url[4096];
snprintf(url, sizeof(url), "%s/%s/_update/%s", WebCtx.es_url, WebCtx.es_index, arg_req->doc_id); snprintf(url, sizeof(url), "%s/%s/_update/%s", WebCtx.es_url, WebCtx.es_index, arg_req->doc_id);
nc->user_data = web_post_async(url, buf); nc->fn_data = web_post_async(url, buf);
} else { } else {
cJSON_AddItemToArray(arr, cJSON_CreateString(arg_req->name)); cJSON_AddItemToArray(arr, cJSON_CreateString(arg_req->name));
@ -565,7 +511,7 @@ void tag(struct mg_connection *nc, struct http_message *hm, struct mg_str *path)
char url[4096]; char url[4096];
snprintf(url, sizeof(url), "%s/%s/_update/%s", WebCtx.es_url, WebCtx.es_index, arg_req->doc_id); snprintf(url, sizeof(url), "%s/%s/_update/%s", WebCtx.es_url, WebCtx.es_index, arg_req->doc_id);
nc->user_data = web_post_async(url, buf); nc->fn_data = web_post_async(url, buf);
} }
char *json_str = cJSON_PrintUnformatted(arr); char *json_str = cJSON_PrintUnformatted(arr);
@ -579,92 +525,73 @@ void tag(struct mg_connection *nc, struct http_message *hm, struct mg_str *path)
free(body); free(body);
} }
int validate_auth(struct mg_connection *nc, struct http_message *hm) { int validate_auth(struct mg_connection *nc, struct mg_http_message *hm) {
char user[256] = {0,}; char user[256] = {0,};
char pass[256] = {0,}; char pass[256] = {0,};
int ret = mg_get_http_basic_auth(hm, user, sizeof(user), pass, sizeof(pass)); mg_http_creds(hm, user, sizeof(user), pass, sizeof(pass));
if (ret == -1 || strcmp(user, WebCtx.auth_user) != 0 || strcmp(pass, WebCtx.auth_pass) != 0) { if (strcmp(user, WebCtx.auth_user) != 0 || strcmp(pass, WebCtx.auth_pass) != 0) {
mg_printf(nc, "HTTP/1.1 401 Unauthorized\r\n" mg_http_reply(nc, 401, "WWW-Authenticate: Basic realm=\"sist2\"", "");
"WWW-Authenticate: Basic realm=\"sist2\"\r\n"
"Content-Length: 0\r\n\r\n");
nc->flags |= MG_F_SEND_AND_CLOSE;
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
static void ev_router(struct mg_connection *nc, int ev, void *p) { static void ev_router(struct mg_connection *nc, int ev, void *ev_data, UNUSED(void *fn_data)) {
struct mg_str scheme;
struct mg_str user_info;
struct mg_str host;
unsigned int port;
struct mg_str path;
struct mg_str query;
struct mg_str fragment;
if (ev == MG_EV_HTTP_REQUEST) {
struct http_message *hm = (struct http_message *) p;
if (mg_parse_uri(hm->uri, &scheme, &user_info, &host, &port, &path, &query, &fragment) != 0) {
mg_http_send_error(nc, 400, NULL);
nc->flags |= MG_F_SEND_AND_CLOSE;
return;
}
if (ev == MG_EV_HTTP_MSG) {
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
if (WebCtx.auth_enabled == TRUE) { if (WebCtx.auth_enabled == TRUE) {
if (!validate_auth(nc, hm)) { if (!validate_auth(nc, hm)) {
nc->is_closing = 1;
return; return;
} }
} }
if (is_equal(&path, &((struct mg_str) MG_MK_STR("/")))) { if (mg_http_match_uri(hm, "/")) {
search_index(nc); search_index(nc);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/css")))) { } else if (mg_http_match_uri(hm, "/css")) {
style(nc, hm); style(nc, hm);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/stats")))) { } else if (mg_http_match_uri(hm, "/stats")) {
stats(nc); stats(nc);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/jslib")))) { } else if (mg_http_match_uri(hm, "/jslib")) {
javascript_lib(nc); javascript_lib(nc);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/jssearch")))) { } else if (mg_http_match_uri(hm, "/jssearch")) {
javascript_search(nc); javascript_search(nc);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/img/sprite-skin-flat.png")))) { } else if (mg_http_match_uri(hm, "/img/sprite-skin-flat.png")) {
img_sprite_skin_flat(nc, hm); img_sprite_skin_flat(nc, hm);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/es")))) { } else if (mg_http_match_uri(hm, "/es")) {
search(nc, hm); search(nc, hm);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/i")))) { } else if (mg_http_match_uri(hm, "/i")) {
index_info(nc); index_info(nc);
} else if (is_equal(&path, &((struct mg_str) MG_MK_STR("/status")))) { } else if (mg_http_match_uri(hm, "/status")) {
status(nc); status(nc);
} else if (has_prefix(&path, &((struct mg_str) MG_MK_STR("/f/")))) { } else if (mg_http_match_uri(hm, "/f/*")) {
file(nc, hm, &path); file(nc, hm);
} else if (has_prefix(&path, &((struct mg_str) MG_MK_STR("/t/")))) { } else if (mg_http_match_uri(hm, "/t/*/*")) {
thumbnail(nc, hm, &path); thumbnail(nc, hm);
} else if (has_prefix(&path, &((struct mg_str) MG_MK_STR("/s/")))) { } else if (mg_http_match_uri(hm, "/s/*")) {
stats_files(nc, hm, &path); stats_files(nc, hm);
} else if (has_prefix(&path, &((struct mg_str) MG_MK_STR("/tag/")))) { } else if (mg_http_match_uri(hm, "/tag/*")) {
if (WebCtx.tag_auth_enabled == TRUE) { if (WebCtx.tag_auth_enabled == TRUE && !validate_auth(nc, hm)) {
if (!validate_auth(nc, hm)) { nc->is_closing = 1;
return; return;
} }
} tag(nc, hm);
tag(nc, hm, &path); } else if (mg_http_match_uri(hm, "/d/*")) {
} else if (has_prefix(&path, &((struct mg_str) MG_MK_STR("/d/")))) { document_info(nc, hm);
document_info(nc, hm, &path);
} else { } else {
mg_http_send_error(nc, 404, NULL); mg_http_reply(nc, 404, "", "Page not found");
nc->flags |= MG_F_SEND_AND_CLOSE;
} }
} else if (ev == MG_EV_POLL) { } else if (ev == MG_EV_POLL) {
if (nc->user_data != NULL) { if (nc->fn_data != NULL) {
//Waiting for ES reply //Waiting for ES reply
subreq_ctx_t *ctx = (subreq_ctx_t *) nc->user_data; subreq_ctx_t *ctx = (subreq_ctx_t *) nc->fn_data;
web_post_async_poll(ctx); web_post_async_poll(ctx);
if (ctx->done == TRUE) { if (ctx->done == TRUE) {
response_t *r = ctx->response; response_t *r = ctx->response;
if (r->status_code == 200) { if (r->status_code == 200) {
@ -684,14 +611,14 @@ static void ev_router(struct mg_connection *nc, int ev, void *p) {
free(json_str); free(json_str);
free(tmp); free(tmp);
} }
mg_http_send_error(nc, 500, NULL);
mg_http_reply(nc, 500, "", "");
} }
free_response(r); free_response(r);
free(ctx->data); free(ctx->data);
free(ctx); free(ctx);
nc->flags |= MG_F_SEND_AND_CLOSE; nc->fn_data = NULL;
nc->user_data = NULL;
} }
} }
} }
@ -702,15 +629,18 @@ void serve(const char *listen_address) {
printf("Starting web server @ http://%s\n", listen_address); printf("Starting web server @ http://%s\n", listen_address);
struct mg_mgr mgr; struct mg_mgr mgr;
mg_mgr_init(&mgr, NULL); mg_mgr_init(&mgr);
struct mg_connection *nc = mg_bind(&mgr, listen_address, ev_router); int ok = 1;
struct mg_connection *nc = mg_http_listen(&mgr, listen_address, ev_router, NULL);
if (nc == NULL) { if (nc == NULL) {
LOG_FATALF("serve.c", "Couldn't bind web server on address %s", listen_address) LOG_FATALF("serve.c", "Couldn't bind web server on address %s", listen_address)
} }
mg_set_protocol_http_websocket(nc);
for (;;) { while (ok) {
mg_mgr_poll(&mgr, 10); mg_mgr_poll(&mgr, 10);
} }
mg_mgr_free(&mgr);
LOG_INFO("serve.c", "Finished web event loop")
} }