diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload deleted file mode 100755 index 3bd21d1..0000000 --- a/.direnv/bin/nix-direnv-reload +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -e -if [[ ! -d "/home/nickorlow/programming/personal/anthracite" ]]; then - echo "Cannot find source directory; Did you move it?" - echo "(Looking for "/home/nickorlow/programming/personal/anthracite")" - echo 'Cannot force reload with this script - use "direnv reload" manually and then try again' - exit 1 -fi - -# rebuild the cache forcefully -_nix_direnv_force_reload=1 direnv exec "/home/nickorlow/programming/personal/anthracite" true - -# Update the mtime for .envrc. -# This will cause direnv to reload again - but without re-building. -touch "/home/nickorlow/programming/personal/anthracite/.envrc" - -# Also update the timestamp of whatever profile_rc we have. -# This makes sure that we know we are up to date. -touch -r "/home/nickorlow/programming/personal/anthracite/.envrc" "/home/nickorlow/programming/personal/anthracite/.direnv"/*.rc diff --git a/.direnv/nix-profile-24.11-mma8n3yfap91nw44 b/.direnv/nix-profile-24.11-mma8n3yfap91nw44 deleted file mode 120000 index 48b10b8..0000000 --- a/.direnv/nix-profile-24.11-mma8n3yfap91nw44 +++ /dev/null @@ -1 +0,0 @@ -/nix/store/gr8ifjf51b4w3v62vvinq4s8w97pn3ag-nix-shell-env \ No newline at end of file diff --git a/.direnv/nix-profile-24.11-mma8n3yfap91nw44.rc b/.direnv/nix-profile-24.11-mma8n3yfap91nw44.rc deleted file mode 100644 index 0ffdf16..0000000 --- a/.direnv/nix-profile-24.11-mma8n3yfap91nw44.rc +++ /dev/null @@ -1,2219 +0,0 @@ -unset shellHook -PATH=${PATH:-} -nix_saved_PATH="$PATH" -XDG_DATA_DIRS=${XDG_DATA_DIRS:-} -nix_saved_XDG_DATA_DIRS="$XDG_DATA_DIRS" -AR='ar' -export AR -AS='as' -export AS -BASH='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash' -CC='gcc' -export CC -CMAKE_INCLUDE_PATH='/nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev/include:/nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev/include:/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/include:/nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1/include' -export CMAKE_INCLUDE_PATH -CMAKE_LIBRARY_PATH='/nix/store/zs44kdd3k01schy32fa916pa17gr7y68-openssl-3.3.2/lib:/nix/store/bmjqxvy53752b3xfvbab6s87xq06hxbs-gcc-13.3.0-libgcc/lib:/nix/store/jn0mgmpirinjs8ag3iznn8j8jl2dp93s-boost-1.81.0/lib:/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib' -export CMAKE_LIBRARY_PATH -CONFIG_SHELL='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash' -export CONFIG_SHELL -CXX='g++' -export CXX -DETERMINISTIC_BUILD='1' -export DETERMINISTIC_BUILD -HOSTTYPE='x86_64' -HOST_PATH='/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5/bin:/nix/store/r99d2m4swgmrv9jvm4l9di40hvanq1aq-findutils-4.10.0/bin:/nix/store/3sln66ij8pg114apkd8p6nr04y37q5z2-diffutils-3.10/bin:/nix/store/yq39xdwm4z0fhx7dsm8mlpgvcz3vbfg3-gnused-4.9/bin:/nix/store/vniy1y5n8g28c55y7788npwc4h09fh7c-gnugrep-3.11/bin:/nix/store/scgfwh3z1s3l2vhvyjsgfgx5ql552sls-gawk-5.3.1/bin:/nix/store/0wqn2k3v5xzrc9rwinijdyr2ywwl82x4-gnutar-1.35/bin:/nix/store/5y240z436gf3rwmkwbhn1a17pqw509w4-gzip-1.13/bin:/nix/store/1yyryxp7mh7zsciapi8f1n0mnxkigmf8-bzip2-1.0.8-bin/bin:/nix/store/hbzw8k8ygv6bfzvsvnd4gb8qmm8xjbvn-gnumake-4.4.1/bin:/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin:/nix/store/rfrjws98w6scfx7m63grb0m6sg925ahd-patch-2.7.6/bin:/nix/store/4i4mjaf7z6gddspar487grxk5k1j4dcd-xz-5.6.3-bin/bin:/nix/store/9wbpsj6ksd16x1qdqs29xli1dpz3fnl0-file-5.45/bin' -export HOST_PATH -IFS=' -' -IN_NIX_SHELL='impure' -export IN_NIX_SHELL -LD='ld' -export LD -LINENO='76' -MACHTYPE='x86_64-pc-linux-gnu' -NIXPKGS_CMAKE_PREFIX_PATH='/nix/store/2gc1mdxn6whvjscqibxkfaamfhspbmcd-pkg-config-wrapper-0.29.2:/nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev:/nix/store/rc5j45brxiyl55fgd3adbcc43pdfr29v-openssl-3.3.2-bin:/nix/store/zs44kdd3k01schy32fa916pa17gr7y68-openssl-3.3.2:/nix/store/bmjqxvy53752b3xfvbab6s87xq06hxbs-gcc-13.3.0-libgcc:/nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev:/nix/store/jn0mgmpirinjs8ag3iznn8j8jl2dp93s-boost-1.81.0:/nix/store/yxf0cmyfrar671zqh0ml8pcw15mxk0mh-cmake-3.30.5:/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8:/nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1:/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0:/nix/store/ap724yhgv28mpsi1mmqcwypj4rrfhqmg-update-autotools-gnu-config-scripts-hook:/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0:/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1' -export NIXPKGS_CMAKE_PREFIX_PATH -NIX_BINTOOLS='/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1' -export NIX_BINTOOLS -NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' -export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu -NIX_BUILD_CORES='12' -export NIX_BUILD_CORES -NIX_CC='/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0' -export NIX_CC -NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' -export NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu -NIX_CFLAGS_COMPILE=' -frandom-seed=gr8ifjf51b -isystem /nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev/include -isystem /nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev/include -isystem /nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/include -isystem /nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1/include -isystem /nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev/include -isystem /nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev/include -isystem /nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/include -isystem /nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1/include' -export NIX_CFLAGS_COMPILE -NIX_ENFORCE_NO_NATIVE='1' -export NIX_ENFORCE_NO_NATIVE -NIX_HARDENING_ENABLE='bindnow format fortify fortify3 pic relro stackprotector strictoverflow zerocallusedregs' -export NIX_HARDENING_ENABLE -NIX_LDFLAGS='-rpath /home/nickorlow/programming/personal/anthracite/outputs/out/lib -L/nix/store/zs44kdd3k01schy32fa916pa17gr7y68-openssl-3.3.2/lib -L/nix/store/bmjqxvy53752b3xfvbab6s87xq06hxbs-gcc-13.3.0-libgcc/lib -L/nix/store/jn0mgmpirinjs8ag3iznn8j8jl2dp93s-boost-1.81.0/lib -L/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib -L/nix/store/zs44kdd3k01schy32fa916pa17gr7y68-openssl-3.3.2/lib -L/nix/store/bmjqxvy53752b3xfvbab6s87xq06hxbs-gcc-13.3.0-libgcc/lib -L/nix/store/jn0mgmpirinjs8ag3iznn8j8jl2dp93s-boost-1.81.0/lib -L/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib' -export NIX_LDFLAGS -NIX_NO_SELF_RPATH='1' -NIX_PKG_CONFIG_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu='1' -export NIX_PKG_CONFIG_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu -NIX_STORE='/nix/store' -export NIX_STORE -NM='nm' -export NM -OBJCOPY='objcopy' -export OBJCOPY -OBJDUMP='objdump' -export OBJDUMP -OLDPWD='' -export OLDPWD -OPTERR='1' -OSTYPE='linux-gnu' -PATH='/nix/store/2gc1mdxn6whvjscqibxkfaamfhspbmcd-pkg-config-wrapper-0.29.2/bin:/nix/store/rc5j45brxiyl55fgd3adbcc43pdfr29v-openssl-3.3.2-bin/bin:/nix/store/yxf0cmyfrar671zqh0ml8pcw15mxk0mh-cmake-3.30.5/bin:/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/bin:/nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1/bin:/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0/bin:/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0/bin:/nix/store/62qjb50708fdhb4f2y7zxyqr1afir4fk-gcc-13.3.0/bin:/nix/store/29mb4q8b5306f4gk2wh38h0c1akb0n97-glibc-2.40-36-bin/bin:/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5/bin:/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1/bin:/nix/store/vk4mlknqk9yjbqa68a7rvpfxfdw3rad7-binutils-2.43.1/bin:/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5/bin:/nix/store/r99d2m4swgmrv9jvm4l9di40hvanq1aq-findutils-4.10.0/bin:/nix/store/3sln66ij8pg114apkd8p6nr04y37q5z2-diffutils-3.10/bin:/nix/store/yq39xdwm4z0fhx7dsm8mlpgvcz3vbfg3-gnused-4.9/bin:/nix/store/vniy1y5n8g28c55y7788npwc4h09fh7c-gnugrep-3.11/bin:/nix/store/scgfwh3z1s3l2vhvyjsgfgx5ql552sls-gawk-5.3.1/bin:/nix/store/0wqn2k3v5xzrc9rwinijdyr2ywwl82x4-gnutar-1.35/bin:/nix/store/5y240z436gf3rwmkwbhn1a17pqw509w4-gzip-1.13/bin:/nix/store/1yyryxp7mh7zsciapi8f1n0mnxkigmf8-bzip2-1.0.8-bin/bin:/nix/store/hbzw8k8ygv6bfzvsvnd4gb8qmm8xjbvn-gnumake-4.4.1/bin:/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin:/nix/store/rfrjws98w6scfx7m63grb0m6sg925ahd-patch-2.7.6/bin:/nix/store/4i4mjaf7z6gddspar487grxk5k1j4dcd-xz-5.6.3-bin/bin:/nix/store/9wbpsj6ksd16x1qdqs29xli1dpz3fnl0-file-5.45/bin' -export PATH -PKG_CONFIG='pkg-config' -export PKG_CONFIG -PKG_CONFIG_PATH='/nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev/lib/pkgconfig:/nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev/lib/pkgconfig:/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib/pkgconfig' -export PKG_CONFIG_PATH -PS4='+ ' -PYTHONHASHSEED='0' -export PYTHONHASHSEED -PYTHONNOUSERSITE='1' -export PYTHONNOUSERSITE -PYTHONPATH='/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib/python3.12/site-packages' -export PYTHONPATH -RANLIB='ranlib' -export RANLIB -READELF='readelf' -export READELF -SHELL='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash' -export SHELL -SIZE='size' -export SIZE -SOURCE_DATE_EPOCH='315532800' -export SOURCE_DATE_EPOCH -STRINGS='strings' -export STRINGS -STRIP='strip' -export STRIP -XDG_DATA_DIRS='/nix/store/2gc1mdxn6whvjscqibxkfaamfhspbmcd-pkg-config-wrapper-0.29.2/share:/nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev/share:/nix/store/yxf0cmyfrar671zqh0ml8pcw15mxk0mh-cmake-3.30.5/share:/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/share:/nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1/share:/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0/share' -export XDG_DATA_DIRS -_PYTHON_HOST_PLATFORM='linux-x86_64' -export _PYTHON_HOST_PLATFORM -_PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata__linux_x86_64-linux-gnu' -export _PYTHON_SYSCONFIGDATA_NAME -__structuredAttrs='' -export __structuredAttrs -_substituteStream_has_warned_replace_deprecation='false' -buildInputs='' -export buildInputs -buildPhase='{ echo "------------------------------------------------------------"; - echo " WARNING: the existence of this path is not guaranteed."; - echo " It is an internal implementation detail for pkgs.mkShell."; - echo "------------------------------------------------------------"; - echo; - # Record all build inputs as runtime dependencies - export; -} >> "$out" -' -export buildPhase -builder='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash' -export builder -cmakeFlags='' -export cmakeFlags -configureFlags='' -export configureFlags -configurePhase='cmakeConfigurePhase' -defaultBuildInputs='' -defaultNativeBuildInputs='/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0 /nix/store/ap724yhgv28mpsi1mmqcwypj4rrfhqmg-update-autotools-gnu-config-scripts-hook /nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh /nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh /nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh /nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh /nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh /nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh /nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh /nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh /nix/store/12lvf0c7xric9cny7slvf9cmhypl1p67-patch-shebangs.sh /nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh /nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh /nix/store/aazf105snicrlvyzzbdj85sx4179rpfp-set-source-date-epoch-to-latest.sh /nix/store/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh /nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0' -depsBuildBuild='' -export depsBuildBuild -depsBuildBuildPropagated='' -export depsBuildBuildPropagated -depsBuildTarget='' -export depsBuildTarget -depsBuildTargetPropagated='' -export depsBuildTargetPropagated -depsHostHost='' -export depsHostHost -depsHostHostPropagated='' -export depsHostHostPropagated -depsTargetTarget='' -export depsTargetTarget -depsTargetTargetPropagated='' -export depsTargetTargetPropagated -doCheck='' -export doCheck -doInstallCheck='' -export doInstallCheck -dontAddDisableDepTrack='1' -export dontAddDisableDepTrack -declare -a envBuildBuildHooks=('addPythonPath' 'sysconfigdataHook' ) -declare -a envBuildHostHooks=('addPythonPath' 'sysconfigdataHook' ) -declare -a envBuildTargetHooks=('addPythonPath' 'sysconfigdataHook' ) -declare -a envHostHostHooks=('pkgConfigWrapper_addPkgConfigPath' 'addCMakeParams' 'ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' ) -declare -a envHostTargetHooks=('pkgConfigWrapper_addPkgConfigPath' 'addCMakeParams' 'ccWrapper_addCVars' 'bintoolsWrapper_addLDVars' ) -declare -a envTargetTargetHooks=() -declare -a fixupOutputHooks=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi' 'if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi' 'if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi' '_moveLib64' '_moveSbin' '_moveSystemdUserUnits' 'patchShebangsAuto' '_pruneLibtoolFiles' '_doStrip' ) -flag='-L/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8/lib' -guess='12' -iframework_seen='' -initialPath='/nix/store/6wgd8c9vq93mqxzc7jhkl86mv6qbc360-coreutils-9.5 /nix/store/r99d2m4swgmrv9jvm4l9di40hvanq1aq-findutils-4.10.0 /nix/store/3sln66ij8pg114apkd8p6nr04y37q5z2-diffutils-3.10 /nix/store/yq39xdwm4z0fhx7dsm8mlpgvcz3vbfg3-gnused-4.9 /nix/store/vniy1y5n8g28c55y7788npwc4h09fh7c-gnugrep-3.11 /nix/store/scgfwh3z1s3l2vhvyjsgfgx5ql552sls-gawk-5.3.1 /nix/store/0wqn2k3v5xzrc9rwinijdyr2ywwl82x4-gnutar-1.35 /nix/store/5y240z436gf3rwmkwbhn1a17pqw509w4-gzip-1.13 /nix/store/1yyryxp7mh7zsciapi8f1n0mnxkigmf8-bzip2-1.0.8-bin /nix/store/hbzw8k8ygv6bfzvsvnd4gb8qmm8xjbvn-gnumake-4.4.1 /nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37 /nix/store/rfrjws98w6scfx7m63grb0m6sg925ahd-patch-2.7.6 /nix/store/4i4mjaf7z6gddspar487grxk5k1j4dcd-xz-5.6.3-bin /nix/store/9wbpsj6ksd16x1qdqs29xli1dpz3fnl0-file-5.45' -isystem_seen='' -mesonFlags='' -export mesonFlags -name='nix-shell-env' -export name -nativeBuildInputs='/nix/store/2gc1mdxn6whvjscqibxkfaamfhspbmcd-pkg-config-wrapper-0.29.2 /nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev /nix/store/bmjqxvy53752b3xfvbab6s87xq06hxbs-gcc-13.3.0-libgcc /nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev /nix/store/yxf0cmyfrar671zqh0ml8pcw15mxk0mh-cmake-3.30.5 /nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8 /nix/store/yxf0cmyfrar671zqh0ml8pcw15mxk0mh-cmake-3.30.5 /nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1' -export nativeBuildInputs -out='/home/nickorlow/programming/personal/anthracite/outputs/out' -export out -outputBin='out' -outputDev='out' -outputDevdoc='REMOVE' -outputDevman='out' -outputDoc='out' -outputInclude='out' -outputInfo='out' -outputLib='out' -outputMan='out' -outputs='out' -export outputs -patches='' -export patches -phases='buildPhase' -export phases -pkg='/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0' -declare -a pkgsBuildBuild=() -declare -a pkgsBuildHost=('/nix/store/2gc1mdxn6whvjscqibxkfaamfhspbmcd-pkg-config-wrapper-0.29.2' '/nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev' '/nix/store/rc5j45brxiyl55fgd3adbcc43pdfr29v-openssl-3.3.2-bin' '/nix/store/zs44kdd3k01schy32fa916pa17gr7y68-openssl-3.3.2' '/nix/store/bmjqxvy53752b3xfvbab6s87xq06hxbs-gcc-13.3.0-libgcc' '/nix/store/cqnj4iwzabn5crvvcigx5cjd2jif7n5y-boost-1.81.0-dev' '/nix/store/jn0mgmpirinjs8ag3iznn8j8jl2dp93s-boost-1.81.0' '/nix/store/yxf0cmyfrar671zqh0ml8pcw15mxk0mh-cmake-3.30.5' '/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8' '/nix/store/zps3l0mc26r7bvjqd8x0y1lbc6gmbdvn-gnumake-4.4.1' '/nix/store/wnl9qpnhayry14lhcbdafhadsjwsdr6p-patchelf-0.15.0' '/nix/store/ap724yhgv28mpsi1mmqcwypj4rrfhqmg-update-autotools-gnu-config-scripts-hook' '/nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh' '/nix/store/m54bmrhj6fqz8nds5zcj97w9s9bckc9v-compress-man-pages.sh' '/nix/store/wgrbkkaldkrlrni33ccvm3b6vbxzb656-make-symlinks-relative.sh' '/nix/store/5yzw0vhkyszf2d179m0qfkgxmp5wjjx4-move-docs.sh' '/nix/store/fyaryjvghbkpfnsyw97hb3lyb37s1pd6-move-lib64.sh' '/nix/store/kd4xwxjpjxi71jkm6ka0np72if9rm3y0-move-sbin.sh' '/nix/store/pag6l61paj1dc9sv15l7bm5c17xn5kyk-move-systemd-user-units.sh' '/nix/store/jivxp510zxakaaic7qkrb7v1dd2rdbw9-multiple-outputs.sh' '/nix/store/12lvf0c7xric9cny7slvf9cmhypl1p67-patch-shebangs.sh' '/nix/store/cickvswrvann041nqxb0rxilc46svw1n-prune-libtool-files.sh' '/nix/store/xyff06pkhki3qy1ls77w10s0v79c9il0-reproducible-builds.sh' '/nix/store/aazf105snicrlvyzzbdj85sx4179rpfp-set-source-date-epoch-to-latest.sh' '/nix/store/gps9qrh99j7g02840wv5x78ykmz30byp-strip.sh' '/nix/store/888bkaqdpfpx72dd8bdc69qsqlgbhcvf-gcc-wrapper-13.3.0' '/nix/store/qlzvmgr8w9prdlyys7irqf86p7bndf5b-binutils-wrapper-2.43.1' ) -declare -a pkgsBuildTarget=() -declare -a pkgsHostHost=() -declare -a pkgsHostTarget=() -declare -a pkgsTargetTarget=() -declare -a postFixupHooks=('cmakePcfileCheckPhase' '_makeSymlinksRelativeInAllOutputs' '_multioutPropagateDev' ) -declare -a postHooks=('makeCmakeFindLibs' ) -declare -a postUnpackHooks=('_updateSourceDateEpochFromSourceRoot' ) -declare -a preConfigureHooks=('_multioutConfig' ) -preConfigurePhases=' updateAutotoolsGnuConfigScriptsPhase' -declare -a preFixupHooks=('_moveToShare' '_multioutDocs' '_multioutDevs' ) -preferLocalBuild='1' -export preferLocalBuild -prefix='/home/nickorlow/programming/personal/anthracite/outputs/out' -declare -a propagatedBuildDepFiles=('propagated-build-build-deps' 'propagated-native-build-inputs' 'propagated-build-target-deps' ) -propagatedBuildInputs='' -export propagatedBuildInputs -declare -a propagatedHostDepFiles=('propagated-host-host-deps' 'propagated-build-inputs' ) -propagatedNativeBuildInputs='' -export propagatedNativeBuildInputs -declare -a propagatedTargetDepFiles=('propagated-target-target-deps' ) -setOutputFlags='' -shell='/nix/store/gwgqdl0242ymlikq9s9s62gkp5cvyal3-bash-5.2p37/bin/bash' -export shell -shellHook='export OPENSSL_DIR="/nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev" -export PKG_CONFIG_PATH="/nix/store/74z4cw9g5fhzkhydpsaac9d41b073dy6-openssl-3.3.2-dev/lib/pkgconfig" -export OPENSSL_NO_VENDOR=1 -export OPENSSL_LIB_DIR="/nix/store/zs44kdd3k01schy32fa916pa17gr7y68-openssl-3.3.2/lib" -' -export shellHook -stdenv='/nix/store/lzrs17sc8bhi87nb1y1q1bas73j6q10y-stdenv-linux' -export stdenv -strictDeps='' -export strictDeps -system='x86_64-linux' -export system -declare -a unpackCmdHooks=('_defaultUnpack' ) -_activatePkgs () -{ - - local hostOffset targetOffset; - local pkg; - for hostOffset in "${allPlatOffsets[@]}"; - do - local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}"; - for targetOffset in "${allPlatOffsets[@]}"; - do - (( hostOffset <= targetOffset )) || continue; - local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]"; - local pkgsSlice="${!pkgsRef}[@]"; - for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; - do - activatePackage "$pkg" "$hostOffset" "$targetOffset"; - done; - done; - done -} -_addRpathPrefix () -{ - - if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then - export NIX_LDFLAGS="-rpath $1/lib ${NIX_LDFLAGS-}"; - fi -} -_addToEnv () -{ - - local depHostOffset depTargetOffset; - local pkg; - for depHostOffset in "${allPlatOffsets[@]}"; - do - local hookVar="${pkgHookVarVars[depHostOffset + 1]}"; - local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}"; - for depTargetOffset in "${allPlatOffsets[@]}"; - do - (( depHostOffset <= depTargetOffset )) || continue; - local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"; - if [[ -z "${strictDeps-}" ]]; then - local visitedPkgs=""; - for pkg in "${pkgsBuildBuild[@]}" "${pkgsBuildHost[@]}" "${pkgsBuildTarget[@]}" "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}" "${pkgsTargetTarget[@]}"; - do - if [[ "$visitedPkgs" = *"$pkg"* ]]; then - continue; - fi; - runHook "${!hookRef}" "$pkg"; - visitedPkgs+=" $pkg"; - done; - else - local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"; - local pkgsSlice="${!pkgsRef}[@]"; - for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; - do - runHook "${!hookRef}" "$pkg"; - done; - fi; - done; - done -} -_allFlags () -{ - - export system pname name version; - while IFS='' read -r varName; do - nixTalkativeLog "@${varName}@ -> ${!varName}"; - args+=("--subst-var" "$varName"); - done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }') -} -_assignFirst () -{ - - local varName="$1"; - local _var; - local REMOVE=REMOVE; - shift; - for _var in "$@"; - do - if [ -n "${!_var-}" ]; then - eval "${varName}"="${_var}"; - return; - fi; - done; - echo; - echo "error: _assignFirst: could not find a non-empty variable whose name to assign to ${varName}."; - echo " The following variables were all unset or empty:"; - echo " $*"; - if [ -z "${out:-}" ]; then - echo ' If you do not want an "out" output in your derivation, make sure to define'; - echo ' the other specific required outputs. This can be achieved by picking one'; - echo " of the above as an output."; - echo ' You do not have to remove "out" if you want to have a different default'; - echo ' output, because the first output is taken as a default.'; - echo; - fi; - return 1 -} -_callImplicitHook () -{ - - local def="$1"; - local hookName="$2"; - if declare -F "$hookName" > /dev/null; then - nixTalkativeLog "calling implicit '$hookName' function hook"; - "$hookName"; - else - if type -p "$hookName" > /dev/null; then - nixTalkativeLog "sourcing implicit '$hookName' script hook"; - source "$hookName"; - else - if [ -n "${!hookName:-}" ]; then - nixTalkativeLog "evaling implicit '$hookName' string hook"; - eval "${!hookName}"; - else - return "$def"; - fi; - fi; - fi -} -_defaultUnpack () -{ - - local fn="$1"; - local destination; - if [ -d "$fn" ]; then - destination="$(stripHash "$fn")"; - if [ -e "$destination" ]; then - echo "Cannot copy $fn to $destination: destination already exists!"; - echo "Did you specify two \"srcs\" with the same \"name\"?"; - return 1; - fi; - cp -pr --reflink=auto -- "$fn" "$destination"; - else - case "$fn" in - *.tar.xz | *.tar.lzma | *.txz) - ( XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn"; - true ) | tar xf - --mode=+w --warning=no-timestamp - ;; - *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) - tar xf "$fn" --mode=+w --warning=no-timestamp - ;; - *) - return 1 - ;; - esac; - fi -} -_doStrip () -{ - - local -ra flags=(dontStripHost dontStripTarget); - local -ra debugDirs=(stripDebugList stripDebugListTarget); - local -ra allDirs=(stripAllList stripAllListTarget); - local -ra stripCmds=(STRIP STRIP_FOR_TARGET); - local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET); - stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin}; - stripDebugListTarget=${stripDebugListTarget[*]:-}; - stripAllList=${stripAllList[*]:-}; - stripAllListTarget=${stripAllListTarget[*]:-}; - local i; - for i in ${!stripCmds[@]}; - do - local -n flag="${flags[$i]}"; - local -n debugDirList="${debugDirs[$i]}"; - local -n allDirList="${allDirs[$i]}"; - local -n stripCmd="${stripCmds[$i]}"; - local -n ranlibCmd="${ranlibCmds[$i]}"; - if [[ -n "${dontStrip-}" || -n "${flag-}" ]] || ! type -f "${stripCmd-}" 2> /dev/null 1>&2; then - continue; - fi; - stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S -p}"; - stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s -p}"; - done -} -_eval () -{ - - if declare -F "$1" > /dev/null 2>&1; then - "$@"; - else - eval "$1"; - fi -} -_logHook () -{ - - if [[ -z ${NIX_LOG_FD-} ]]; then - return; - fi; - local hookKind="$1"; - local hookExpr="$2"; - shift 2; - if declare -F "$hookExpr" > /dev/null 2>&1; then - nixTalkativeLog "calling '$hookKind' function hook '$hookExpr'" "$@"; - else - if type -p "$hookExpr" > /dev/null; then - nixTalkativeLog "sourcing '$hookKind' script hook '$hookExpr'"; - else - if [[ "$hookExpr" != "_callImplicitHook"* ]]; then - local exprToOutput; - if [[ ${NIX_DEBUG:-0} -ge 5 ]]; then - exprToOutput="$hookExpr"; - else - local hookExprLine; - while IFS= read -r hookExprLine; do - hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}"; - if [[ -n "$hookExprLine" ]]; then - exprToOutput+="$hookExprLine\\n "; - fi; - done <<< "$hookExpr"; - exprToOutput="${exprToOutput%%\\n }"; - fi; - nixTalkativeLog "evaling '$hookKind' string hook '$exprToOutput'"; - fi; - fi; - fi -} -_makeSymlinksRelative () -{ - - local symlinkTarget; - if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then - return; - fi; - while IFS= read -r -d '' f; do - symlinkTarget=$(readlink "$f"); - if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then - continue; - fi; - if [ ! -e "$symlinkTarget" ]; then - echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)"; - fi; - echo "rewriting symlink $f to be relative to $prefix"; - ln -snrf "$symlinkTarget" "$f"; - done < <(find $prefix -type l -print0) -} -_makeSymlinksRelativeInAllOutputs () -{ - - local output; - for output in $(getAllOutputNames); - do - prefix="${!output}" _makeSymlinksRelative; - done -} -_moveLib64 () -{ - - if [ "${dontMoveLib64-}" = 1 ]; then - return; - fi; - if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then - return; - fi; - echo "moving $prefix/lib64/* to $prefix/lib"; - mkdir -p $prefix/lib; - shopt -s dotglob; - for i in $prefix/lib64/*; - do - mv --no-clobber "$i" $prefix/lib; - done; - shopt -u dotglob; - rmdir $prefix/lib64; - ln -s lib $prefix/lib64 -} -_moveSbin () -{ - - if [ "${dontMoveSbin-}" = 1 ]; then - return; - fi; - if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then - return; - fi; - echo "moving $prefix/sbin/* to $prefix/bin"; - mkdir -p $prefix/bin; - shopt -s dotglob; - for i in $prefix/sbin/*; - do - mv "$i" $prefix/bin; - done; - shopt -u dotglob; - rmdir $prefix/sbin; - ln -s bin $prefix/sbin -} -_moveSystemdUserUnits () -{ - - if [ "${dontMoveSystemdUserUnits:-0}" = 1 ]; then - return; - fi; - if [ ! -e "${prefix:?}/lib/systemd/user" ]; then - return; - fi; - local source="$prefix/lib/systemd/user"; - local target="$prefix/share/systemd/user"; - echo "moving $source/* to $target"; - mkdir -p "$target"; - ( shopt -s dotglob; - for i in "$source"/*; - do - mv "$i" "$target"; - done ); - rmdir "$source"; - ln -s "$target" "$source" -} -_moveToShare () -{ - - if [ -n "$__structuredAttrs" ]; then - if [ -z "${forceShare-}" ]; then - forceShare=(man doc info); - fi; - else - forceShare=(${forceShare:-man doc info}); - fi; - if [[ -z "$out" ]]; then - return; - fi; - for d in "${forceShare[@]}"; - do - if [ -d "$out/$d" ]; then - if [ -d "$out/share/$d" ]; then - echo "both $d/ and share/$d/ exist!"; - else - echo "moving $out/$d to $out/share/$d"; - mkdir -p $out/share; - mv $out/$d $out/share/; - fi; - fi; - done -} -_multioutConfig () -{ - - if [ "$(getAllOutputNames)" = "out" ] || [ -z "${setOutputFlags-1}" ]; then - return; - fi; - if [ -z "${shareDocName:-}" ]; then - local confScript="${configureScript:-}"; - if [ -z "$confScript" ] && [ -x ./configure ]; then - confScript=./configure; - fi; - if [ -f "$confScript" ]; then - local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"; - fi; - if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then - shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"; - fi; - fi; - prependToVar configureFlags --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info --docdir="${!outputDoc}"/share/doc/"${shareDocName}" --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec --localedir="${!outputLib}"/share/locale; - prependToVar installFlags pkgconfigdir="${!outputDev}"/lib/pkgconfig m4datadir="${!outputDev}"/share/aclocal aclocaldir="${!outputDev}"/share/aclocal -} -_multioutDevs () -{ - - if [ "$(getAllOutputNames)" = "out" ] || [ -z "${moveToDev-1}" ]; then - return; - fi; - moveToOutput include "${!outputInclude}"; - moveToOutput lib/pkgconfig "${!outputDev}"; - moveToOutput share/pkgconfig "${!outputDev}"; - moveToOutput lib/cmake "${!outputDev}"; - moveToOutput share/aclocal "${!outputDev}"; - for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc; - do - echo "Patching '$f' includedir to output ${!outputInclude}"; - sed -i "/^includedir=/s,=\${prefix},=${!outputInclude}," "$f"; - done -} -_multioutDocs () -{ - - local REMOVE=REMOVE; - moveToOutput share/info "${!outputInfo}"; - moveToOutput share/doc "${!outputDoc}"; - moveToOutput share/gtk-doc "${!outputDevdoc}"; - moveToOutput share/devhelp/books "${!outputDevdoc}"; - moveToOutput share/man "${!outputMan}"; - moveToOutput share/man/man3 "${!outputDevman}" -} -_multioutPropagateDev () -{ - - if [ "$(getAllOutputNames)" = "out" ]; then - return; - fi; - local outputFirst; - for outputFirst in $(getAllOutputNames); - do - break; - done; - local propagaterOutput="$outputDev"; - if [ -z "$propagaterOutput" ]; then - propagaterOutput="$outputFirst"; - fi; - if [ -z "${propagatedBuildOutputs+1}" ]; then - local po_dirty="$outputBin $outputInclude $outputLib"; - set +o pipefail; - propagatedBuildOutputs=`echo "$po_dirty" | tr -s ' ' '\n' | grep -v -F "$propagaterOutput" | sort -u | tr '\n' ' ' `; - set -o pipefail; - fi; - if [ -z "$propagatedBuildOutputs" ]; then - return; - fi; - mkdir -p "${!propagaterOutput}"/nix-support; - for output in $propagatedBuildOutputs; - do - echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/propagated-build-inputs; - done -} -_overrideFirst () -{ - - if [ -z "${!1-}" ]; then - _assignFirst "$@"; - fi -} -_pruneLibtoolFiles () -{ - - if [ "${dontPruneLibtoolFiles-}" ] || [ ! -e "$prefix" ]; then - return; - fi; - find "$prefix" -type f -name '*.la' -exec grep -q '^# Generated by .*libtool' {} \; -exec grep -q "^old_library=''" {} \; -exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \; -} -_updateSourceDateEpochFromSourceRoot () -{ - - if [ -n "$sourceRoot" ]; then - updateSourceDateEpoch "$sourceRoot"; - fi -} -activatePackage () -{ - - local pkg="$1"; - local -r hostOffset="$2"; - local -r targetOffset="$3"; - (( hostOffset <= targetOffset )) || exit 1; - if [ -f "$pkg" ]; then - nixTalkativeLog "sourcing setup hook '$pkg'"; - source "$pkg"; - fi; - if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then - addToSearchPath _PATH "$pkg/bin"; - fi; - if (( hostOffset <= -1 )); then - addToSearchPath _XDG_DATA_DIRS "$pkg/share"; - fi; - if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then - addToSearchPath _HOST_PATH "$pkg/bin"; - fi; - if [[ -f "$pkg/nix-support/setup-hook" ]]; then - nixTalkativeLog "sourcing setup hook '$pkg/nix-support/setup-hook'"; - source "$pkg/nix-support/setup-hook"; - fi -} -addCMakeParams () -{ - - addToSearchPath NIXPKGS_CMAKE_PREFIX_PATH $1 -} -addEnvHooks () -{ - - local depHostOffset="$1"; - shift; - local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]"; - local pkgHookVar; - for pkgHookVar in "${!pkgHookVarsSlice}"; - do - eval "${pkgHookVar}s"'+=("$@")'; - done -} -addPythonPath () -{ - - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.12/site-packages -} -addToSearchPath () -{ - - addToSearchPathWithCustomDelimiter ":" "$@" -} -addToSearchPathWithCustomDelimiter () -{ - - local delimiter="$1"; - local varName="$2"; - local dir="$3"; - if [[ -d "$dir" && "${!varName:+${delimiter}${!varName}${delimiter}}" != *"${delimiter}${dir}${delimiter}"* ]]; then - export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"; - fi -} -appendToVar () -{ - - local -n nameref="$1"; - local useArray type; - if [ -n "$__structuredAttrs" ]; then - useArray=true; - else - useArray=false; - fi; - if type=$(declare -p "$1" 2> /dev/null); then - case "${type#* }" in - -A*) - echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." 1>&2; - return 1 - ;; - -a*) - useArray=true - ;; - *) - useArray=false - ;; - esac; - fi; - shift; - if $useArray; then - nameref=(${nameref+"${nameref[@]}"} "$@"); - else - nameref="${nameref-} $*"; - fi -} -auditTmpdir () -{ - - local dir="$1"; - [ -e "$dir" ] || return 0; - echo "checking for references to $TMPDIR/ in $dir..."; - local i; - find "$dir" -type f -print0 | while IFS= read -r -d '' i; do - if [[ "$i" =~ .build-id ]]; then - continue; - fi; - if isELF "$i"; then - if { - printf :; - patchelf --print-rpath "$i" - } | grep -q -F ":$TMPDIR/"; then - echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"; - exit 1; - fi; - fi; - if isScript "$i"; then - if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then - if grep -q -F "$TMPDIR/" "$i"; then - echo "wrapper script $i contains a forbidden reference to $TMPDIR/"; - exit 1; - fi; - fi; - fi; - done -} -bintoolsWrapper_addLDVars () -{ - - local role_post; - getHostRoleEnvHook; - if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_LDFLAGS${role_post}+=" -L$1/lib64"; - fi; - if [[ -d "$1/lib" ]]; then - local -a glob=($1/lib/lib*); - if [ "${#glob[*]}" -gt 0 ]; then - export NIX_LDFLAGS${role_post}+=" -L$1/lib"; - fi; - fi -} -buildPhase () -{ - - runHook preBuild; - if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile or custom buildPhase, doing nothing"; - else - foundMakefile=1; - local flagsArray=(${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray; - echoCmd 'build flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - fi; - runHook postBuild -} -ccWrapper_addCVars () -{ - - local role_post; - getHostRoleEnvHook; - if [ -d "$1/include" ]; then - export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include"; - fi; - if [ -d "$1/Library/Frameworks" ]; then - export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks"; - fi -} -checkPhase () -{ - - runHook preCheck; - if [[ -z "${foundMakefile:-}" ]]; then - echo "no Makefile or custom checkPhase, doing nothing"; - runHook postCheck; - return; - fi; - if [[ -z "${checkTarget:-}" ]]; then - if make -n ${makefile:+-f $makefile} check > /dev/null 2>&1; then - checkTarget="check"; - else - if make -n ${makefile:+-f $makefile} test > /dev/null 2>&1; then - checkTarget="test"; - fi; - fi; - fi; - if [[ -z "${checkTarget:-}" ]]; then - echo "no check/test target in ${makefile:-Makefile}, doing nothing"; - else - local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget; - echoCmd 'check flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - fi; - runHook postCheck -} -cmakeConfigurePhase () -{ - - runHook preConfigure; - : ${cmakeBuildDir:=build}; - export CTEST_OUTPUT_ON_FAILURE=1; - if [ -n "${enableParallelChecking-1}" ]; then - export CTEST_PARALLEL_LEVEL=$NIX_BUILD_CORES; - fi; - if [ -z "${dontFixCmake-}" ]; then - fixCmakeFiles .; - fi; - if [ -z "${dontUseCmakeBuildDir-}" ]; then - mkdir -p "$cmakeBuildDir"; - cd "$cmakeBuildDir"; - : ${cmakeDir:=..}; - else - : ${cmakeDir:=.}; - fi; - if [ -z "${dontAddPrefix-}" ]; then - prependToVar cmakeFlags "-DCMAKE_INSTALL_PREFIX=$prefix"; - fi; - prependToVar cmakeFlags "-DCMAKE_CXX_COMPILER=$CXX"; - prependToVar cmakeFlags "-DCMAKE_C_COMPILER=$CC"; - prependToVar cmakeFlags "-DCMAKE_AR=$(command -v $AR)"; - prependToVar cmakeFlags "-DCMAKE_RANLIB=$(command -v $RANLIB)"; - prependToVar cmakeFlags "-DCMAKE_STRIP=$(command -v $STRIP)"; - prependToVar cmakeFlags "-DCMAKE_FIND_FRAMEWORK=LAST"; - prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib"; - if [[ -z "$shareDocName" ]]; then - local cmakeLists="${cmakeDir}/CMakeLists.txt"; - if [[ -f "$cmakeLists" ]]; then - local shareDocName="$(grep --only-matching --perl-regexp --ignore-case '\bproject\s*\(\s*"?\K([^[:space:]")]+)' < "$cmakeLists" | head -n1)"; - fi; - if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_+-]'; then - if [[ -n "${pname-}" ]]; then - shareDocName="$pname"; - else - shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"; - fi; - fi; - fi; - prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec"; - prependToVar cmakeFlags "-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"; - if [ -z "${doCheck-}" ]; then - prependToVar cmakeFlags "-DBUILD_TESTING=OFF"; - fi; - prependToVar cmakeFlags "-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release}"; - prependToVar cmakeFlags "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"; - prependToVar cmakeFlags "-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF"; - prependToVar cmakeFlags "-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF"; - if [ "${buildPhase-}" = ninjaBuildPhase ]; then - prependToVar cmakeFlags "-GNinja"; - fi; - local flagsArray=(); - concatTo flagsArray cmakeFlags cmakeFlagsArray; - echoCmd 'cmake flags' "${flagsArray[@]}"; - cmake "$cmakeDir" "${flagsArray[@]}"; - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1; - echo "cmake: enabled parallel building"; - fi; - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1; - echo "cmake: enabled parallel installing"; - fi; - runHook postConfigure -} -cmakePcfileCheckPhase () -{ - - while IFS= read -rd '' file; do - grepout=$(grep --line-number '}//nix/store' "$file" || true); - if [ -n "$grepout" ]; then - { - echo "Broken paths found in a .pc file! $file"; - echo "The following lines have issues (specifically '//' in paths)."; - echo "$grepout"; - echo "It is very likely that paths are being joined improperly."; - echo 'ex: "${prefix}/@CMAKE_INSTALL_LIBDIR@" should be "@CMAKE_INSTALL_FULL_LIBDIR@"'; - echo "Please see https://github.com/NixOS/nixpkgs/issues/144170 for more details."; - exit 1 - } 1>&2; - fi; - done < <(find "${!outputDev}" -iname "*.pc" -print0) -} -compressManPages () -{ - - local dir="$1"; - if [ -L "$dir"/share ] || [ -L "$dir"/share/man ] || [ ! -d "$dir/share/man" ]; then - return; - fi; - echo "gzipping man pages under $dir/share/man/"; - find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 | while IFS= read -r -d '' f; do - if gzip -c -n "$f" > "$f".gz; then - rm "$f"; - else - rm "$f".gz; - fi; - done; - find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 | sort -z | while IFS= read -r -d '' f; do - local target; - target="$(readlink -f "$f")"; - if [ -f "$target".gz ]; then - ln -sf "$target".gz "$f".gz && rm "$f"; - fi; - done -} -concatStringsSep () -{ - - local sep="$1"; - local name="$2"; - local type oldifs; - if type=$(declare -p "$name" 2> /dev/null); then - local -n nameref="$name"; - case "${type#* }" in - -A*) - echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." 1>&2; - return 1 - ;; - -a*) - local IFS="$sep"; - echo -n "${nameref[*]}" - ;; - *) - echo -n "${nameref// /"${sep}"}" - ;; - esac; - fi -} -concatTo () -{ - - local -; - set -o noglob; - local -n targetref="$1"; - shift; - local arg default name type; - for arg in "$@"; - do - IFS="=" read -r name default <<< "$arg"; - local -n nameref="$name"; - if [[ -z "${nameref[*]}" && -n "$default" ]]; then - targetref+=("$default"); - else - if type=$(declare -p "$name" 2> /dev/null); then - case "${type#* }" in - -A*) - echo "concatTo(): ERROR: trying to use concatTo on an associative array." 1>&2; - return 1 - ;; - -a*) - targetref+=("${nameref[@]}") - ;; - *) - if [[ "$name" = *"Array" ]]; then - nixErrorLog "concatTo(): $name is not declared as array, treating as a singleton. This will become an error in future"; - targetref+=(${nameref+"${nameref[@]}"}); - else - targetref+=(${nameref-}); - fi - ;; - esac; - fi; - fi; - done -} -configurePhase () -{ - - runHook preConfigure; - : "${configureScript=}"; - if [[ -z "$configureScript" && -x ./configure ]]; then - configureScript=./configure; - fi; - if [ -z "${dontFixLibtool:-}" ]; then - export lt_cv_deplibs_check_method="${lt_cv_deplibs_check_method-pass_all}"; - local i; - find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do - echo "fixing libtool script $i"; - fixLibtool "$i"; - done; - CONFIGURE_MTIME_REFERENCE=$(mktemp configure.mtime.reference.XXXXXX); - find . -executable -type f -name configure -exec grep -l 'GNU Libtool is free software; you can redistribute it and/or modify' {} \; -exec touch -r {} "$CONFIGURE_MTIME_REFERENCE" \; -exec sed -i s_/usr/bin/file_file_g {} \; -exec touch -r "$CONFIGURE_MTIME_REFERENCE" {} \;; - rm -f "$CONFIGURE_MTIME_REFERENCE"; - fi; - if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - prependToVar configureFlags "${prefixKey:---prefix=}$prefix"; - fi; - if [[ -f "$configureScript" ]]; then - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if grep -q dependency-tracking "$configureScript"; then - prependToVar configureFlags --disable-dependency-tracking; - fi; - fi; - if [ -z "${dontDisableStatic:-}" ]; then - if grep -q enable-static "$configureScript"; then - prependToVar configureFlags --disable-static; - fi; - fi; - if [ -z "${dontPatchShebangsInConfigure:-}" ]; then - patchShebangs --build "$configureScript"; - fi; - fi; - if [ -n "$configureScript" ]; then - local -a flagsArray; - concatTo flagsArray configureFlags configureFlagsArray; - echoCmd 'configure flags' "${flagsArray[@]}"; - $configureScript "${flagsArray[@]}"; - unset flagsArray; - else - echo "no configure script, doing nothing"; - fi; - runHook postConfigure -} -consumeEntire () -{ - - if IFS='' read -r -d '' "$1"; then - echo "consumeEntire(): ERROR: Input null bytes, won't process" 1>&2; - return 1; - fi -} -distPhase () -{ - - runHook preDist; - local flagsArray=(); - concatTo flagsArray distFlags distFlagsArray distTarget=dist; - echo 'dist flags: %q' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - if [ "${dontCopyDist:-0}" != 1 ]; then - mkdir -p "$out/tarballs"; - cp -pvd ${tarballs[*]:-*.tar.gz} "$out/tarballs"; - fi; - runHook postDist -} -dumpVars () -{ - - if [ "${noDumpEnvVars:-0}" != 1 ]; then - { - install -m 0600 /dev/null "$NIX_BUILD_TOP/env-vars" && export 2> /dev/null >| "$NIX_BUILD_TOP/env-vars" - } || true; - fi -} -echoCmd () -{ - - printf "%s:" "$1"; - shift; - printf ' %q' "$@"; - echo -} -exitHandler () -{ - - exitCode="$?"; - set +e; - if [ -n "${showBuildStats:-}" ]; then - read -r -d '' -a buildTimes < <(times); - echo "build times:"; - echo "user time for the shell ${buildTimes[0]}"; - echo "system time for the shell ${buildTimes[1]}"; - echo "user time for all child processes ${buildTimes[2]}"; - echo "system time for all child processes ${buildTimes[3]}"; - fi; - if (( "$exitCode" != 0 )); then - runHook failureHook; - if [ -n "${succeedOnFailure:-}" ]; then - echo "build failed with exit code $exitCode (ignored)"; - mkdir -p "$out/nix-support"; - printf "%s" "$exitCode" > "$out/nix-support/failed"; - exit 0; - fi; - else - runHook exitHook; - fi; - return "$exitCode" -} -findInputs () -{ - - local -r pkg="$1"; - local -r hostOffset="$2"; - local -r targetOffset="$3"; - (( hostOffset <= targetOffset )) || exit 1; - local varVar="${pkgAccumVarVars[hostOffset + 1]}"; - local varRef="$varVar[$((targetOffset - hostOffset))]"; - local var="${!varRef}"; - unset -v varVar varRef; - local varSlice="$var[*]"; - case "${!varSlice-}" in - *" $pkg "*) - return 0 - ;; - esac; - unset -v varSlice; - eval "$var"'+=("$pkg")'; - if ! [ -e "$pkg" ]; then - echo "build input $pkg does not exist" 1>&2; - exit 1; - fi; - function mapOffset () - { - local -r inputOffset="$1"; - local -n outputOffset="$2"; - if (( inputOffset <= 0 )); then - outputOffset=$((inputOffset + hostOffset)); - else - outputOffset=$((inputOffset - 1 + targetOffset)); - fi - }; - local relHostOffset; - for relHostOffset in "${allPlatOffsets[@]}"; - do - local files="${propagatedDepFilesVars[relHostOffset + 1]}"; - local hostOffsetNext; - mapOffset "$relHostOffset" hostOffsetNext; - (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue; - local relTargetOffset; - for relTargetOffset in "${allPlatOffsets[@]}"; - do - (( "$relHostOffset" <= "$relTargetOffset" )) || continue; - local fileRef="${files}[$relTargetOffset - $relHostOffset]"; - local file="${!fileRef}"; - unset -v fileRef; - local targetOffsetNext; - mapOffset "$relTargetOffset" targetOffsetNext; - (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue; - [[ -f "$pkg/nix-support/$file" ]] || continue; - local pkgNext; - read -r -d '' pkgNext < "$pkg/nix-support/$file" || true; - for pkgNext in $pkgNext; - do - findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext"; - done; - done; - done -} -fixCmakeFiles () -{ - - echo "fixing cmake files..."; - find "$1" -type f \( -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print | while read fn; do - sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp"; - mv "$fn.tmp" "$fn"; - done -} -fixLibtool () -{ - - local search_path; - for flag in $NIX_LDFLAGS; - do - case $flag in - -L*) - search_path+=" ${flag#-L}" - ;; - esac; - done; - sed -i "$1" -e "s^eval \(sys_lib_search_path=\).*^\1'${search_path:-}'^" -e 's^eval sys_lib_.+search_path=.*^^' -} -fixupPhase () -{ - - local output; - for output in $(getAllOutputNames); - do - if [ -e "${!output}" ]; then - chmod -R u+w,u-s,g-s "${!output}"; - fi; - done; - runHook preFixup; - local output; - for output in $(getAllOutputNames); - do - prefix="${!output}" runHook fixupOutput; - done; - recordPropagatedDependencies; - if [ -n "${setupHook:-}" ]; then - mkdir -p "${!outputDev}/nix-support"; - substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"; - fi; - if [ -n "${setupHooks:-}" ]; then - mkdir -p "${!outputDev}/nix-support"; - local hook; - for hook in ${setupHooks[@]}; - do - local content; - consumeEntire content < "$hook"; - substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook"; - unset -v content; - done; - unset -v hook; - fi; - if [ -n "${propagatedUserEnvPkgs:-}" ]; then - mkdir -p "${!outputBin}/nix-support"; - printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"; - fi; - runHook postFixup -} -genericBuild () -{ - - export GZIP_NO_TIMESTAMPS=1; - if [ -f "${buildCommandPath:-}" ]; then - source "$buildCommandPath"; - return; - fi; - if [ -n "${buildCommand:-}" ]; then - eval "$buildCommand"; - return; - fi; - if [ -z "${phases[*]:-}" ]; then - phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}"; - fi; - for curPhase in ${phases[*]}; - do - runPhase "$curPhase"; - done -} -getAllOutputNames () -{ - - if [ -n "$__structuredAttrs" ]; then - echo "${!outputs[*]}"; - else - echo "$outputs"; - fi -} -getHostRole () -{ - - getRole "$hostOffset" -} -getHostRoleEnvHook () -{ - - getRole "$depHostOffset" -} -getRole () -{ - - case $1 in - -1) - role_post='_FOR_BUILD' - ;; - 0) - role_post='' - ;; - 1) - role_post='_FOR_TARGET' - ;; - *) - echo "binutils-wrapper-2.43.1: used as improper sort of dependency" 1>&2; - return 1 - ;; - esac -} -getTargetRole () -{ - - getRole "$targetOffset" -} -getTargetRoleEnvHook () -{ - - getRole "$depTargetOffset" -} -getTargetRoleWrapper () -{ - - case $targetOffset in - -1) - export NIX_BINTOOLS_WRAPPER_TARGET_BUILD_x86_64_unknown_linux_gnu=1 - ;; - 0) - export NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu=1 - ;; - 1) - export NIX_BINTOOLS_WRAPPER_TARGET_TARGET_x86_64_unknown_linux_gnu=1 - ;; - *) - echo "binutils-wrapper-2.43.1: used as improper sort of dependency" 1>&2; - return 1 - ;; - esac -} -installCheckPhase () -{ - - runHook preInstallCheck; - if [[ -z "${foundMakefile:-}" ]]; then - echo "no Makefile or custom installCheckPhase, doing nothing"; - else - if [[ -z "${installCheckTarget:-}" ]] && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" > /dev/null 2>&1; then - echo "no installcheck target in ${makefile:-Makefile}, doing nothing"; - else - local flagsArray=(${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray installCheckFlags installCheckFlagsArray installCheckTarget=installcheck; - echoCmd 'installcheck flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - fi; - fi; - runHook postInstallCheck -} -installPhase () -{ - - runHook preInstall; - if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile or custom installPhase, doing nothing"; - runHook postInstall; - return; - else - foundMakefile=1; - fi; - if [ -n "$prefix" ]; then - mkdir -p "$prefix"; - fi; - local flagsArray=(${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL"); - concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install; - echoCmd 'install flags' "${flagsArray[@]}"; - make ${makefile:+-f $makefile} "${flagsArray[@]}"; - unset flagsArray; - runHook postInstall -} -isELF () -{ - - local fn="$1"; - local fd; - local magic; - exec {fd}< "$fn"; - read -r -n 4 -u "$fd" magic; - exec {fd}>&-; - if [ "$magic" = 'ELF' ]; then - return 0; - else - return 1; - fi -} -isMachO () -{ - - local fn="$1"; - local fd; - local magic; - exec {fd}< "$fn"; - read -r -n 4 -u "$fd" magic; - exec {fd}>&-; - if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then - return 0; - else - if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then - return 0; - else - if [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then - return 0; - else - return 1; - fi; - fi; - fi -} -isScript () -{ - - local fn="$1"; - local fd; - local magic; - exec {fd}< "$fn"; - read -r -n 2 -u "$fd" magic; - exec {fd}>&-; - if [[ "$magic" =~ \#! ]]; then - return 0; - else - return 1; - fi -} -makeCmakeFindLibs () -{ - - isystem_seen=; - iframework_seen=; - for flag in ${NIX_CFLAGS_COMPILE-} ${NIX_LDFLAGS-}; - do - if test -n "$isystem_seen" && test -d "$flag"; then - isystem_seen=; - addToSearchPath CMAKE_INCLUDE_PATH "${flag}"; - else - if test -n "$iframework_seen" && test -d "$flag"; then - iframework_seen=; - addToSearchPath CMAKE_FRAMEWORK_PATH "${flag}"; - else - isystem_seen=; - iframework_seen=; - case $flag in - -I*) - addToSearchPath CMAKE_INCLUDE_PATH "${flag:2}" - ;; - -L*) - addToSearchPath CMAKE_LIBRARY_PATH "${flag:2}" - ;; - -F*) - addToSearchPath CMAKE_FRAMEWORK_PATH "${flag:2}" - ;; - -isystem) - isystem_seen=1 - ;; - -iframework) - iframework_seen=1 - ;; - esac; - fi; - fi; - done -} -mapOffset () -{ - - local -r inputOffset="$1"; - local -n outputOffset="$2"; - if (( inputOffset <= 0 )); then - outputOffset=$((inputOffset + hostOffset)); - else - outputOffset=$((inputOffset - 1 + targetOffset)); - fi -} -moveToOutput () -{ - - local patt="$1"; - local dstOut="$2"; - local output; - for output in $(getAllOutputNames); - do - if [ "${!output}" = "$dstOut" ]; then - continue; - fi; - local srcPath; - for srcPath in "${!output}"/$patt; - do - if [ ! -e "$srcPath" ] && [ ! -L "$srcPath" ]; then - continue; - fi; - if [ "$dstOut" = REMOVE ]; then - echo "Removing $srcPath"; - rm -r "$srcPath"; - else - local dstPath="$dstOut${srcPath#${!output}}"; - echo "Moving $srcPath to $dstPath"; - if [ -d "$dstPath" ] && [ -d "$srcPath" ]; then - rmdir "$srcPath" --ignore-fail-on-non-empty; - if [ -d "$srcPath" ]; then - mv -t "$dstPath" "$srcPath"/*; - rmdir "$srcPath"; - fi; - else - mkdir -p "$(readlink -m "$dstPath/..")"; - mv "$srcPath" "$dstPath"; - fi; - fi; - local srcParent="$(readlink -m "$srcPath/..")"; - if [ -n "$(find "$srcParent" -maxdepth 0 -type d -empty 2> /dev/null)" ]; then - echo "Removing empty $srcParent/ and (possibly) its parents"; - rmdir -p --ignore-fail-on-non-empty "$srcParent" 2> /dev/null || true; - fi; - done; - done -} -nixChattyLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixDebugLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixErrorLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixInfoLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixNoticeLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixTalkativeLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixVomitLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -nixWarnLog () -{ - - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then - return; - fi; - printf "%s\n" "$*" >&"$NIX_LOG_FD" -} -patchELF () -{ - - local dir="$1"; - [ -e "$dir" ] || return 0; - echo "shrinking RPATHs of ELF executables and libraries in $dir"; - local i; - while IFS= read -r -d '' i; do - if [[ "$i" =~ .build-id ]]; then - continue; - fi; - if ! isELF "$i"; then - continue; - fi; - echo "shrinking $i"; - patchelf --shrink-rpath "$i" || true; - done < <(find "$dir" -type f -print0) -} -patchPhase () -{ - - runHook prePatch; - local -a patchesArray; - concatTo patchesArray patches; - for i in "${patchesArray[@]}"; - do - echo "applying patch $i"; - local uncompress=cat; - case "$i" in - *.gz) - uncompress="gzip -d" - ;; - *.bz2) - uncompress="bzip2 -d" - ;; - *.xz) - uncompress="xz -d" - ;; - *.lzma) - uncompress="lzma -d" - ;; - esac; - local -a flagsArray; - concatTo flagsArray patchFlags=-p1; - $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}"; - done; - runHook postPatch -} -patchShebangs () -{ - - local pathName; - local update; - while [[ $# -gt 0 ]]; do - case "$1" in - --host) - pathName=HOST_PATH; - shift - ;; - --build) - pathName=PATH; - shift - ;; - --update) - update=true; - shift - ;; - --) - shift; - break - ;; - -* | --*) - echo "Unknown option $1 supplied to patchShebangs" 1>&2; - return 1 - ;; - *) - break - ;; - esac; - done; - echo "patching script interpreter paths in $@"; - local f; - local oldPath; - local newPath; - local arg0; - local args; - local oldInterpreterLine; - local newInterpreterLine; - if [[ $# -eq 0 ]]; then - echo "No arguments supplied to patchShebangs" 1>&2; - return 0; - fi; - local f; - while IFS= read -r -d '' f; do - isScript "$f" || continue; - read -r oldInterpreterLine < "$f" || [ "$oldInterpreterLine" ]; - read -r oldPath arg0 args <<< "${oldInterpreterLine:2}"; - if [[ -z "${pathName:-}" ]]; then - if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then - pathName=HOST_PATH; - else - pathName=PATH; - fi; - fi; - if [[ "$oldPath" == *"/bin/env" ]]; then - if [[ $arg0 == "-S" ]]; then - arg0=${args%% *}; - args=${args#* }; - newPath="$(PATH="${!pathName}" type -P "env" || true)"; - args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args"; - else - if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then - echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" 1>&2; - exit 1; - else - newPath="$(PATH="${!pathName}" type -P "$arg0" || true)"; - fi; - fi; - else - if [[ -z $oldPath ]]; then - oldPath="/bin/sh"; - fi; - newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)"; - args="$arg0 $args"; - fi; - newInterpreterLine="$newPath $args"; - newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}}; - if [[ -n "$oldPath" && ( "$update" == true || "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ) ]]; then - if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then - echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""; - escapedInterpreterLine=${newInterpreterLine//\\/\\\\}; - timestamp=$(stat --printf "%y" "$f"); - sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"; - touch --date "$timestamp" "$f"; - fi; - fi; - done < <(find "$@" -type f -perm -0100 -print0) -} -patchShebangsAuto () -{ - - if [[ -z "${dontPatchShebangs-}" && -e "$prefix" ]]; then - if [[ "$output" != out && "$output" = "$outputDev" ]]; then - patchShebangs --build "$prefix"; - else - patchShebangs --host "$prefix"; - fi; - fi -} -pkgConfigWrapper_addPkgConfigPath () -{ - - local role_post; - getHostRoleEnvHook; - addToSearchPath "PKG_CONFIG_PATH${role_post}" "$1/lib/pkgconfig"; - addToSearchPath "PKG_CONFIG_PATH${role_post}" "$1/share/pkgconfig" -} -prependToVar () -{ - - local -n nameref="$1"; - local useArray type; - if [ -n "$__structuredAttrs" ]; then - useArray=true; - else - useArray=false; - fi; - if type=$(declare -p "$1" 2> /dev/null); then - case "${type#* }" in - -A*) - echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." 1>&2; - return 1 - ;; - -a*) - useArray=true - ;; - *) - useArray=false - ;; - esac; - fi; - shift; - if $useArray; then - nameref=("$@" ${nameref+"${nameref[@]}"}); - else - nameref="$* ${nameref-}"; - fi -} -printLines () -{ - - (( "$#" > 0 )) || return 0; - printf '%s\n' "$@" -} -printWords () -{ - - (( "$#" > 0 )) || return 0; - printf '%s ' "$@" -} -recordPropagatedDependencies () -{ - - declare -ra flatVars=(depsBuildBuildPropagated propagatedNativeBuildInputs depsBuildTargetPropagated depsHostHostPropagated propagatedBuildInputs depsTargetTargetPropagated); - declare -ra flatFiles=("${propagatedBuildDepFiles[@]}" "${propagatedHostDepFiles[@]}" "${propagatedTargetDepFiles[@]}"); - local propagatedInputsIndex; - for propagatedInputsIndex in "${!flatVars[@]}"; - do - local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]"; - local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}"; - [[ -n "${!propagatedInputsSlice}" ]] || continue; - mkdir -p "${!outputDev}/nix-support"; - printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile"; - done -} -runHook () -{ - - local hookName="$1"; - shift; - local hooksSlice="${hookName%Hook}Hooks[@]"; - local hook; - for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; - do - _logHook "$hookName" "$hook" "$@"; - _eval "$hook" "$@"; - done; - return 0 -} -runOneHook () -{ - - local hookName="$1"; - shift; - local hooksSlice="${hookName%Hook}Hooks[@]"; - local hook ret=1; - for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; - do - _logHook "$hookName" "$hook" "$@"; - if _eval "$hook" "$@"; then - ret=0; - break; - fi; - done; - return "$ret" -} -runPhase () -{ - - local curPhase="$*"; - if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then - return; - fi; - if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then - return; - fi; - if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then - return; - fi; - if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then - return; - fi; - if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then - return; - fi; - if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then - return; - fi; - if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then - return; - fi; - if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then - return; - fi; - if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then - return; - fi; - showPhaseHeader "$curPhase"; - dumpVars; - local startTime endTime; - startTime=$(date +"%s"); - eval "${!curPhase:-$curPhase}"; - endTime=$(date +"%s"); - showPhaseFooter "$curPhase" "$startTime" "$endTime"; - if [ "$curPhase" = unpackPhase ]; then - [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}"; - cd -- "${sourceRoot:-.}"; - fi -} -showPhaseFooter () -{ - - local phase="$1"; - local startTime="$2"; - local endTime="$3"; - local delta=$(( endTime - startTime )); - (( delta < 30 )) && return; - local H=$((delta/3600)); - local M=$((delta%3600/60)); - local S=$((delta%60)); - echo -n "$phase completed in "; - (( H > 0 )) && echo -n "$H hours "; - (( M > 0 )) && echo -n "$M minutes "; - echo "$S seconds" -} -showPhaseHeader () -{ - - local phase="$1"; - echo "Running phase: $phase"; - if [[ -z ${NIX_LOG_FD-} ]]; then - return; - fi; - printf "@nix { \"action\": \"setPhase\", \"phase\": \"%s\" }\n" "$phase" >&"$NIX_LOG_FD" -} -stripDirs () -{ - - local cmd="$1"; - local ranlibCmd="$2"; - local paths="$3"; - local stripFlags="$4"; - local excludeFlags=(); - local pathsNew=; - [ -z "$cmd" ] && echo "stripDirs: Strip command is empty" 1>&2 && exit 1; - [ -z "$ranlibCmd" ] && echo "stripDirs: Ranlib command is empty" 1>&2 && exit 1; - local pattern; - if [ -n "${stripExclude:-}" ]; then - for pattern in "${stripExclude[@]}"; - do - excludeFlags+=(-a '!' '(' -name "$pattern" -o -wholename "$prefix/$pattern" ')'); - done; - fi; - local p; - for p in ${paths}; - do - if [ -e "$prefix/$p" ]; then - pathsNew="${pathsNew} $prefix/$p"; - fi; - done; - paths=${pathsNew}; - if [ -n "${paths}" ]; then - echo "stripping (with command $cmd and flags $stripFlags) in $paths"; - local striperr; - striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')"; - find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -printf '%D-%i,%p\0' | sort -t, -k1,1 -u -z | cut -d, -f2- -z | xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2> "$striperr" || exit_code=$?; - [[ "$exit_code" = 123 || -z "$exit_code" ]] || ( cat "$striperr" 1>&2 && exit 1 ); - rm "$striperr"; - find $paths -name '*.a' -type f -exec $ranlibCmd '{}' \; 2> /dev/null; - fi -} -stripHash () -{ - - local strippedName casematchOpt=0; - strippedName="$(basename -- "$1")"; - shopt -q nocasematch && casematchOpt=1; - shopt -u nocasematch; - if [[ "$strippedName" =~ ^[a-z0-9]{32}- ]]; then - echo "${strippedName:33}"; - else - echo "$strippedName"; - fi; - if (( casematchOpt )); then - shopt -s nocasematch; - fi -} -substitute () -{ - - local input="$1"; - local output="$2"; - shift 2; - if [ ! -f "$input" ]; then - echo "substitute(): ERROR: file '$input' does not exist" 1>&2; - return 1; - fi; - local content; - consumeEntire content < "$input"; - if [ -e "$output" ]; then - chmod +w "$output"; - fi; - substituteStream content "file '$input'" "$@" > "$output" -} -substituteAll () -{ - - local input="$1"; - local output="$2"; - local -a args=(); - _allFlags; - substitute "$input" "$output" "${args[@]}" -} -substituteAllInPlace () -{ - - local fileName="$1"; - shift; - substituteAll "$fileName" "$fileName" "$@" -} -substituteAllStream () -{ - - local -a args=(); - _allFlags; - substituteStream "$1" "$2" "${args[@]}" -} -substituteInPlace () -{ - - local -a fileNames=(); - for arg in "$@"; - do - if [[ "$arg" = "--"* ]]; then - break; - fi; - fileNames+=("$arg"); - shift; - done; - if ! [[ "${#fileNames[@]}" -gt 0 ]]; then - echo "substituteInPlace called without any files to operate on (files must come before options!)" 1>&2; - return 1; - fi; - for file in "${fileNames[@]}"; - do - substitute "$file" "$file" "$@"; - done -} -substituteStream () -{ - - local var=$1; - local description=$2; - shift 2; - while (( "$#" )); do - local replace_mode="$1"; - case "$1" in - --replace) - if ! "$_substituteStream_has_warned_replace_deprecation"; then - echo "substituteStream() in derivation $name: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" 1>&2; - _substituteStream_has_warned_replace_deprecation=true; - fi; - replace_mode='--replace-warn' - ;& - --replace-quiet | --replace-warn | --replace-fail) - pattern="$2"; - replacement="$3"; - shift 3; - local savedvar; - savedvar="${!var}"; - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'; - if [ "$pattern" != "$replacement" ]; then - if [ "${!var}" == "$savedvar" ]; then - if [ "$replace_mode" == --replace-warn ]; then - printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2; - else - if [ "$replace_mode" == --replace-fail ]; then - printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" 1>&2; - return 1; - fi; - fi; - fi; - fi - ;; - --subst-var) - local varName="$2"; - shift 2; - if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then - echo "substituteStream() in derivation $name: ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." 1>&2; - return 1; - fi; - if [ -z ${!varName+x} ]; then - echo "substituteStream() in derivation $name: ERROR: variable \$$varName is unset" 1>&2; - return 1; - fi; - pattern="@$varName@"; - replacement="${!varName}"; - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' - ;; - --subst-var-by) - pattern="@$2@"; - replacement="$3"; - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'; - shift 3 - ;; - *) - echo "substituteStream() in derivation $name: ERROR: Invalid command line argument: $1" 1>&2; - return 1 - ;; - esac; - done; - printf "%s" "${!var}" -} -sysconfigdataHook () -{ - - if [ "$1" = '/nix/store/kjgslpdqchx1sm7a5h9xibi5rrqcqfnl-python3-3.12.8' ]; then - export _PYTHON_HOST_PLATFORM='linux-x86_64'; - export _PYTHON_SYSCONFIGDATA_NAME='_sysconfigdata__linux_x86_64-linux-gnu'; - fi -} -toPythonPath () -{ - - local paths="$1"; - local result=; - for i in $paths; - do - p="$i/lib/python3.12/site-packages"; - result="${result}${result:+:}$p"; - done; - echo $result -} -unpackFile () -{ - - curSrc="$1"; - echo "unpacking source archive $curSrc"; - if ! runOneHook unpackCmd "$curSrc"; then - echo "do not know how to unpack source archive $curSrc"; - exit 1; - fi -} -unpackPhase () -{ - - runHook preUnpack; - if [ -z "${srcs:-}" ]; then - if [ -z "${src:-}" ]; then - echo 'variable $src or $srcs should point to the source'; - exit 1; - fi; - srcs="$src"; - fi; - local -a srcsArray; - concatTo srcsArray srcs; - local dirsBefore=""; - for i in *; - do - if [ -d "$i" ]; then - dirsBefore="$dirsBefore $i "; - fi; - done; - for i in "${srcsArray[@]}"; - do - unpackFile "$i"; - done; - : "${sourceRoot=}"; - if [ -n "${setSourceRoot:-}" ]; then - runOneHook setSourceRoot; - else - if [ -z "$sourceRoot" ]; then - for i in *; - do - if [ -d "$i" ]; then - case $dirsBefore in - *\ $i\ *) - - ;; - *) - if [ -n "$sourceRoot" ]; then - echo "unpacker produced multiple directories"; - exit 1; - fi; - sourceRoot="$i" - ;; - esac; - fi; - done; - fi; - fi; - if [ -z "$sourceRoot" ]; then - echo "unpacker appears to have produced no directories"; - exit 1; - fi; - echo "source root is $sourceRoot"; - if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then - chmod -R u+w -- "$sourceRoot"; - fi; - runHook postUnpack -} -updateAutotoolsGnuConfigScriptsPhase () -{ - - if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then - return; - fi; - for script in config.sub config.guess; - do - for f in $(find . -type f -name "$script"); - do - echo "Updating Autotools / GNU config script to a newer upstream version: $f"; - cp -f "/nix/store/0yl1wf4jim6830k2m3c3v5kyp2l9z8ay-gnu-config-2024-01-01/$script" "$f"; - done; - done -} -updateSourceDateEpoch () -{ - - local path="$1"; - [[ $path == -* ]] && path="./$path"; - local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated | head -c -1)); - local time="${res[0]//\.[0-9]*/}"; - local newestFile="${res[1]}"; - if [ "${time:-0}" -gt "$SOURCE_DATE_EPOCH" ]; then - echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile"; - export SOURCE_DATE_EPOCH="$time"; - local now="$(date +%s)"; - if [ "$time" -gt $((now - 60)) ]; then - echo "warning: file $newestFile may be generated; SOURCE_DATE_EPOCH may be non-deterministic"; - fi; - fi -} -PATH="$PATH${nix_saved_PATH:+:$nix_saved_PATH}" -XDG_DATA_DIRS="$XDG_DATA_DIRS${nix_saved_XDG_DATA_DIRS:+:$nix_saved_XDG_DATA_DIRS}" -export NIX_BUILD_TOP="$(mktemp -d -t nix-shell.XXXXXX)" -export TMP="$NIX_BUILD_TOP" -export TMPDIR="$NIX_BUILD_TOP" -export TEMP="$NIX_BUILD_TOP" -export TEMPDIR="$NIX_BUILD_TOP" -eval "${shellHook:-}" diff --git a/.envrc b/.envrc deleted file mode 100644 index 1d953f4..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml deleted file mode 100644 index d171f54..0000000 --- a/.forgejo/workflows/docker-publish.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Docker Build & Publish - -on: [push, workflow_dispatch] -#test11111 -env: - CTR_REGISTRY: git.nickorlow.com - IMAGE_NAME: "anthracite" - -jobs: - build: - runs-on: ubuntu-latest - - permissions: - contents: read - packages: write - id-token: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Setup Docker buildx - uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - - name: Get Release Tag - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - - name: Write Version - run: | - echo Building with version number $RELEASE_VERSION - echo $RELEASE_VERSION > src/build/version.txt - - - name: Log into registry ${{ env.CTR_REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.CTR_REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.CTR_REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index f380c9d..b3a3973 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,14 +1,16 @@ name: Build and Publish Docker Image on: - release: - types: [created] + push: + branches: [ "main" ] + env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} jobs: build: + runs-on: ubuntu-latest permissions: contents: read @@ -22,14 +24,6 @@ jobs: - name: Setup Docker buildx uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - name: Get Release Tag - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - - name: Write Version - run: | - echo Building with version number $RELEASE_VERSION - echo $RELEASE_VERSION > build_supp/version.txt - - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c diff --git a/.gitignore b/.gitignore index 2058835..02ba98c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -build/ -build_supp/version.cpp -.cache/ +anthracite diff --git a/CHANGELOG.md b/CHANGELOG.md index 62590f1..4a72cf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,157 +1,3 @@ -# 0.3.0 -- SSL support via OpenSSL -- Added "Thread Manager" class to allow for multiple (or custom) threading models (process per thread, event loop) -- Default (and only included) threading model is now event loop -- Rewrote request parser for readability and speed -- Rewrote socket system for readability and speed -- Added improved logging with different log levels -- Separated anthracite into libanthracite and anthracite-bin to allow for other projects to implement anthracite (example in ./src/api_main.cpp) -- Cleaned up code and seperated most code into headers & source -- Revamped build system to use CMake properly -- Moved CI/CD over to Forgejo -- Added simple config file system (will be completely replaced by v1.0) -- General system stability improvements were made to enhance the user's experience - -## HTTP Request Parser Rewrite - -The following benchmark (source in ./tests/speed_tests.cpp) shows the speed -improvements made between 0.2.0 and 0.3.0, as well as comparison to boost's -parsing library. - -It should probably be noted that Boost's parser can do a lot more than mine -and is likely slower for good reason. Also, these were single runs but -subsequent runs showed similar results. - -| Parser Tested | RPS | -|--------------------|--------------| -| Anthracite 0.2.0 | 688,042 | -| Anthracite 0.3.0 | 27,027,000 | -| Boost Beast | 1,023,230 | - -# 0.2.0 Fifth Pre-Release -- Added true HTTP/1.1 support with persistent connections -- Added HTTP/1.0 vs HTTP/1.1 test to benchmarking suite -- Slight improvements to benchmarking -- Added version number information to binaries at build-time -- Added error page generation build step -- GitHub CI pipeline will now tag the version when publishing the container to the registry -- General system stability improvements were made to enhance the user's experience - -## HTTP/1.1 Speed improvements -The following benchmark shows the speed improvements created by implementing -persistent connections with HTTP/1.1. This test measures the time it takes to -request a 222 byte file 10,000 times by one user - -``` -=====[ Anthracite Benchmarking Tool ]===== -Requests : 10000 -Test : HTTP 1.0 vs HTTP 1.1 - - -HTTP/1.0 Total Time: 3.1160 seconds -HTTP/1.1 Total Time: 0.3621 seconds -``` - -## Benchmark Results -Each benchmark makes 1000 requests requesting a 50MB file using -100 users to the webserver running in a Docker container. - -This is a change from previous benchmarks which used a large html -file. - -``` -=====[ Anthracite Benchmarking Tool ]===== -Requests : 1000 -Users/Threads: 100 -Test : Load Test - - -====[ anthracite ]===== -Average Response Time: 19.5831 seconds -p995 Response Time : 38.9563 seconds -p99 Response Time : 37.1518 seconds -p90 Response Time : 27.5117 seconds -p75 Response Time : 21.4345 seconds -p50 Response Time : 17.7999 seconds -Total Response Time : 19583.1491 seconds -====[ nginx ]===== -Average Response Time: 19.5464 seconds -p995 Response Time : 49.9527 seconds -p99 Response Time : 47.5037 seconds -p90 Response Time : 29.7642 seconds -p75 Response Time : 21.4559 seconds -p50 Response Time : 17.1338 seconds -Total Response Time : 19546.4399 seconds -====[ apache ]===== -Average Response Time: 20.8133 seconds -p995 Response Time : 42.5797 seconds -p99 Response Time : 39.8580 seconds -p90 Response Time : 30.1892 seconds -p75 Response Time : 22.3492 seconds -p50 Response Time : 19.0437 seconds -Total Response Time : 20813.3035 seconds -========== -Total Test Time : 612.3112 seconds -``` - -# 0.1.2 Fourth Pre-Release - -- Fixed bug with mapping / to index.html -- Addex Origin-Server header - -# 0.1.1 Third Pre-Release - -- Add mappings for common MIME types -- Heavily improved resource utilization -- Removed non-cached file backend -- Updated dockerfile to remove build files after build - -## Known Issues - -- Benchmark program does not include resource utilization - -## Benchmark Results - -Each benchmark makes 1000 requests requesting a 21.9Mb file using -100 users to the webserver running in a Docker container. - -The results from this benchmark vary quite a bit. About half the time, -Apache can beat anthracite. - -``` -=====[ Anthracite Benchmarking Tool ]===== -Requests : 1000 -Users/Threads: 100 - - -====[ anthracite ]===== -Average Response Time: 5.5128 seconds -p995 Response Time : 8.3105 seconds -p99 Response Time : 8.1796 seconds -p90 Response Time : 6.4393 seconds -p75 Response Time : 5.8587 seconds -p50 Response Time : 5.4393 seconds -Total Response Time : 5512.8397 seconds -====[ nginx ]===== -Average Response Time: 6.0201 seconds -p995 Response Time : 12.4648 seconds -p99 Response Time : 11.9635 seconds -p90 Response Time : 8.7204 seconds -p75 Response Time : 6.7331 seconds -p50 Response Time : 5.5341 seconds -Total Response Time : 6020.1369 seconds -====[ apache ]===== -Average Response Time: 5.9795 seconds -p995 Response Time : 12.8266 seconds -p99 Response Time : 11.6336 seconds -p90 Response Time : 7.1465 seconds -p75 Response Time : 6.4420 seconds -p50 Response Time : 5.8224 seconds -Total Response Time : 5979.5446 seconds -========== -Total Test Time : 179.7469 seconds -``` - # 0.1.0 Second Pre-Release - Allowed multiple clients to be handled at once via multithreadding diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 4b70101..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,74 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -project(anthracite) - -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED True) -set(CMAKE_CXX_FLAGS_RELEASE "-O3") -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - -find_package(OpenSSL REQUIRED) - -configure_file(build_supp/version.txt version.txt COPYONLY) - -add_custom_command( - COMMAND ../build_supp/version.sh - DEPENDS version.txt - OUTPUT ${CMAKE_BINARY_DIR}/version.cpp - COMMENT "Generated supplemental build files (version)" -) - -add_custom_target(build-supplemental - COMMAND cd ../build_supp && python3 ./error_gen.py - COMMAND mkdir -p www && cp -r ../default_www/regular/* ./www/ - COMMAND cp ../build_supp/default_config.cfg ./anthracite.cfg - DEPENDS ../default_www/regular/* build_supp/error_gen.py ${CMAKE_BINARY_DIR}/version.cpp - COMMENT "Generated supplemental build files (default www dir + default config + error pages)" -) - -FILE(GLOB LIB_SOURCES lib/*.cpp lib/**/*.cpp) -add_library(anthracite ${LIB_SOURCES} ${CMAKE_BINARY_DIR}/version.cpp) -add_dependencies(anthracite build-supplemental) -target_link_libraries(anthracite OpenSSL::SSL OpenSSL::Crypto) -target_include_directories(anthracite PUBLIC ${OPENSSL_INCLUDE_DIR}) - -add_executable(anthracite-bin src/file_main.cpp) -target_link_libraries(anthracite-bin anthracite) -add_dependencies(anthracite-bin build-supplemental) -add_dependencies(anthracite-bin anthracite) - -include(FetchContent) -FetchContent_Declare( - googletest - URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip -) - -FetchContent_MakeAvailable(googletest) - -file(GLOB TESTS_SRC CONFIGURE_DEPENDS "tests/*.cpp") -enable_testing() - -add_custom_target(test_files - COMMAND cp -r ../tests/test_files . - DEPENDS ../tests/test_files/* - COMMENT "Copied test resource files" -) - -add_executable( - tests - ${TESTS_SRC} -) -add_dependencies(tests anthracite) -add_dependencies(tests test_files) - -target_link_libraries( - tests - GTest::gtest_main -) -target_link_libraries( - tests - anthracite -) - -include(GoogleTest) -gtest_discover_tests(tests) diff --git a/Dockerfile b/Dockerfile index 449ea5d..54cd30a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,7 @@ -FROM alpine AS build-env +FROM alpine as build-env -RUN apk add --no-cache build-base python3 cmake openssl-dev -COPY ./src ./src -COPY ./lib ./lib -COPY ./tests ./tests -COPY ./default_www ./default_www -COPY ./build_supp ./build_supp -COPY ./CMakeLists.txt . +RUN apk add --no-cache build-base +COPY ./src/ . +RUN make build-release - -RUN mkdir build -WORKDIR build -RUN cmake -DCMAKE_BUILD_TYPE=Release .. -RUN make anthracite-bin - -FROM alpine -RUN apk add --no-cache libgcc libstdc++ -COPY --from=build-env /build/anthracite-bin /anthracite-bin -COPY --from=build-env /build/error_pages /error_pages -COPY --from=build-env /build_supp/default_config.cfg /anthracite.cfg -COPY /default_www/docker /www -CMD ["/anthracite-bin"] +CMD ["/anthracite"] diff --git a/README.md b/README.md index f5e06da..7565e61 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,59 @@ # Anthracite +A simple web server written in C++ -Anthracite is an extensible, low-dependency, fast web server. +## Module-Based Backends +Anthracite includes (read: will include) system for allowing different "backend modules" to handle requests. +This allows for anthracite to be extended for additional use-cases. For example, the following +backends could be implemented: -## Developing +- File: Return files from a directory +- Reverse Proxy: Pass the request to another server +- Web Framework: Pass the request into an application built on your favorite web framework -To build/develop Anthracite, you must have C++20, OpenSSL, CMake, Make, and Python3 installed. +## Building & Debugging -Create a `build/` directory, run `cmake ..`, and then `make` to build. +Once you have the repository cloned, you can run the following command to build Anthracite: -## Features +```shell +make build +``` -- HTTP/1.0 & HTTP/1.1 Support -- SSL via OpenSSL -- Event loop thread management -- libanthracite library for reating custom webservers -- Configuration through configuration file -- Minimal dependencies (only OpenSSL & stantart library so far) +It will create a binary file named `./anthracite` -## Roadmap -- HTTP/2 -- HTTP/3 -- More threading modes -- Proxy backend -- Security/Error handling audit +To save time, you can use the following command to build and run anthracite on port `8080`: + +```shell +make run +``` + +To save time again, you can use the following command to build and debug anthracite in gdb: + +```shell +make debug +``` + +## Usage + +Run the following commands to serve all files located in `./www/`: + +```shell +./anthracite [PORT_NUMBER] +``` + +## Todo +- [x] Serve HTML Pages +- [x] Properly parse HTTP requests +- [x] Add module-based backend system for handling requests +- [x] Multithreading +- [ ] Cleanup (this one will never truly be done) +- [ ] Proper error handling +- [ ] Build out module-based backend system for handling requests +- [ ] Fix glaring security issues +- [ ] Faster parsing +- [ ] Speed optimizations such as keeping the most visited html pages in memory +- [ ] Cleanup codebase +- [ ] Enable cache support +- [ ] Support newer HTTP versions ## Screenshots diff --git a/benchmarks/http_1_v_11/anthracite.Dockerfile b/benchmark/anthracite.Dockerfile similarity index 100% rename from benchmarks/http_1_v_11/anthracite.Dockerfile rename to benchmark/anthracite.Dockerfile diff --git a/benchmarks/load_test/apache.Dockerfile b/benchmark/apache.Dockerfile similarity index 100% rename from benchmarks/load_test/apache.Dockerfile rename to benchmark/apache.Dockerfile diff --git a/benchmarks/load_test/benchmark.py b/benchmark/benchmark.py similarity index 91% rename from benchmarks/load_test/benchmark.py rename to benchmark/benchmark.py index c502dea..76354eb 100644 --- a/benchmarks/load_test/benchmark.py +++ b/benchmark/benchmark.py @@ -5,7 +5,7 @@ from concurrent.futures import ThreadPoolExecutor from http.client import HTTPConnection HTTPConnection._http_vsn_str = 'HTTP/1.0' -urls = { 'anthracite': 'http://localhost:8081/50MB.zip','nginx': 'http://localhost:8082/50MB.zip', 'apache': 'http://localhost:8083/50MB.zip' } +urls = { 'anthracite': 'http://localhost:8081/large.html','nginx': 'http://localhost:8082/large.html', 'apache': 'http://localhost:8083/large.html' } num_requests = 1000 num_users = 100 # number of threads response_times = {} @@ -34,11 +34,9 @@ def make_request(request_number, server_name): response_times[server_name].append(response_time) else: print(f'Request {request_number}: Request failed with status code {response.status_code}') - print('=====[ Anthracite Benchmarking Tool ]=====') print(f'Requests : {num_requests}') -print(f'Users/Threads: {num_users}') -print(f'Test : Load Test\n\n') +print(f'Users/Threads: {num_users}\n\n') start_all_time = time.time() futures = [] diff --git a/benchmarks/load_test/docker-compose.yaml b/benchmark/docker-compose.yaml similarity index 100% rename from benchmarks/load_test/docker-compose.yaml rename to benchmark/docker-compose.yaml diff --git a/benchmarks/load_test/nginx.Dockerfile b/benchmark/nginx.Dockerfile similarity index 100% rename from benchmarks/load_test/nginx.Dockerfile rename to benchmark/nginx.Dockerfile diff --git a/benchmark/rebuild-container.sh b/benchmark/rebuild-container.sh new file mode 100755 index 0000000..9cac615 --- /dev/null +++ b/benchmark/rebuild-container.sh @@ -0,0 +1,5 @@ +cd .. +docker build . -t anthracite:latest +cd benchmark +docker build . -t benchmark-anthracite -f anthracite.Dockerfile +docker compose up -d diff --git a/benchmark/www/large.html b/benchmark/www/large.html new file mode 100644 index 0000000..cb6730d --- /dev/null +++ b/benchmark/www/large.html @@ -0,0 +1,1020251 @@ + + diff --git a/benchmarks/http_1_v_11/benchmark.py b/benchmarks/http_1_v_11/benchmark.py deleted file mode 100644 index fdb468f..0000000 --- a/benchmarks/http_1_v_11/benchmark.py +++ /dev/null @@ -1,36 +0,0 @@ -import socket -import time - -num_requests = 10000 - -http_1_times = [] -http_11_times = [] - -print('=====[ Anthracite Benchmarking Tool ]=====') -print(f'Requests : {num_requests}') -print(f'Test : HTTP 1.0 vs HTTP 1.1\n\n') - -with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: - s.connect(("localhost" , 8091)) - for i in range(num_requests): - start_time = time.time() - s.sendall(b"GET /test.html HTTP/1.1\r\nAccept: text/html\r\nConnection: keep-alive\r\n\r\n") - data = s.recv(220) - end_time = time.time() - http_11_times.append((end_time - start_time)) - s.close() - -for i in range(num_requests): - with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: - start_time = time.time() - s.connect(("localhost" , 8091)) - s.sendall(b"GET /test.html HTTP/1.0\r\nAccept: text/html\r\n\r\n") - data = s.recv(220) - end_time = time.time() - http_1_times.append((end_time - start_time)) - s.close() - -run_time_1 = sum(http_1_times) -run_time_11 = sum(http_11_times) -print(f'HTTP/1.0 Total Time: {run_time_1:.4f} seconds') -print(f'HTTP/1.1 Total Time: {run_time_11:.4f} seconds') diff --git a/benchmarks/http_1_v_11/docker-compose.yaml b/benchmarks/http_1_v_11/docker-compose.yaml deleted file mode 100644 index b9b748c..0000000 --- a/benchmarks/http_1_v_11/docker-compose.yaml +++ /dev/null @@ -1,7 +0,0 @@ -services: - anthracite: - build: - context: . - dockerfile: anthracite.Dockerfile - ports: - - "8091:80" diff --git a/benchmarks/http_1_v_11/rebuild-container.sh b/benchmarks/http_1_v_11/rebuild-container.sh deleted file mode 100755 index f066005..0000000 --- a/benchmarks/http_1_v_11/rebuild-container.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd ../.. -docker build . -t anthracite:latest -cd benchmarks/http_1_v_11 -docker compose build diff --git a/benchmarks/http_1_v_11/run.sh b/benchmarks/http_1_v_11/run.sh deleted file mode 100755 index 82cff58..0000000 --- a/benchmarks/http_1_v_11/run.sh +++ /dev/null @@ -1 +0,0 @@ -docker-compose stop && ./rebuild-container.sh && docker compose up -d && clear && python3 benchmark.py && docker-compose stop diff --git a/benchmarks/http_1_v_11/www/test.html b/benchmarks/http_1_v_11/www/test.html deleted file mode 100644 index 3a5086d..0000000 --- a/benchmarks/http_1_v_11/www/test.html +++ /dev/null @@ -1,2 +0,0 @@ -

Anthracite Benchmarking

-

Test document to test the speed of HTTP/1.0 and HTTP/1.1

diff --git a/benchmarks/load_test/anthracite.Dockerfile b/benchmarks/load_test/anthracite.Dockerfile deleted file mode 100644 index 69bb295..0000000 --- a/benchmarks/load_test/anthracite.Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM anthracite:latest -COPY ./www/ /www/ diff --git a/benchmarks/load_test/rebuild-container.sh b/benchmarks/load_test/rebuild-container.sh deleted file mode 100755 index 311ccff..0000000 --- a/benchmarks/load_test/rebuild-container.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd ../.. -docker build . -t anthracite:latest -cd benchmarks/load_test -docker compose build -docker compose up -d diff --git a/benchmarks/load_test/run.sh b/benchmarks/load_test/run.sh deleted file mode 100755 index 82cff58..0000000 --- a/benchmarks/load_test/run.sh +++ /dev/null @@ -1 +0,0 @@ -docker-compose stop && ./rebuild-container.sh && docker compose up -d && clear && python3 benchmark.py && docker-compose stop diff --git a/benchmarks/load_test/www/50MB.zip b/benchmarks/load_test/www/50MB.zip deleted file mode 100644 index a03466a..0000000 Binary files a/benchmarks/load_test/www/50MB.zip and /dev/null differ diff --git a/build_supp/default_config.cfg b/build_supp/default_config.cfg deleted file mode 100644 index 380e4fd..0000000 --- a/build_supp/default_config.cfg +++ /dev/null @@ -1,6 +0,0 @@ -log_level INFO - -http 8080 1000 blocking - -event_loop 6 10000 -www_dir ./www diff --git a/build_supp/error_gen.py b/build_supp/error_gen.py deleted file mode 100644 index 79bfd7f..0000000 --- a/build_supp/error_gen.py +++ /dev/null @@ -1,76 +0,0 @@ -# error_gen.py -# Generates default html error pages for Anthracite - -import os - -version = "Unknown" - -with open("version.txt", "r") as file: - version = file.read().strip() - -def generate_error_page(error_code, error_title): - html = f""" - {error_title} - -
-

{error_code} - {error_title}

-
-

Anthracite/{version}

-

This is Open Source Software

-
- -""" - return html - -error_codes = { - 400: "Bad Request", - 401: "Unauthorized", - 402: "Payment Required", - 403: "Forbidden", - 404: "Not Found", - 405: "Method Not Allowed", - 406: "Not Acceptable", - 407: "Proxy Authentication Required", - 408: "Request Timeout", - 409: "Conflict", - 410: "Gone", - 411: "Length Required", - 412: "Precondition Failed", - 413: "Payload Too Large", - 414: "URI Too Long", - 415: "Unsupported Media Type", - 416: "Range Not Satisfiable", - 417: "Expectation Failed", - 418: "I'm a teapot", - 421: "Misdirected Request", - 422: "Unprocessable Entity", - 423: "Locked", - 424: "Failed Dependency", - 425: "Too Early", - 426: "Upgrade Required", - 428: "Precondition Required", - 429: "Too Many Requests", - 431: "Request Header Fields Too Large", - 451: "Unavailable For Legal Reasons", - 500: "Internal Server Error", - 501: "Not Implemented", - 502: "Bad Gateway", - 503: "Service Unavailable", - 504: "Gateway Timeout", - 505: "HTTP Version Not Supported", - 506: "Variant Also Negotiates", - 507: "Insufficient Storage", - 508: "Loop Detected", - 510: "Not Extended", - 511: "Network Authentication Required" -} - - -error_dir = '../build/error_pages' -os.makedirs(error_dir, exist_ok=True) - -for code, title in error_codes.items(): - error_page = generate_error_page(code, title) - file_path = os.path.join(error_dir, f"{code}.html") - with open(file_path, "w") as file: - file.write(error_page) diff --git a/build_supp/version.sh b/build_supp/version.sh deleted file mode 100755 index 1a2a16a..0000000 --- a/build_supp/version.sh +++ /dev/null @@ -1,4 +0,0 @@ -echo "#include " > version.cpp -echo "#include \"../lib/version.hpp\"" >> version.cpp -echo "const std::string ANTHRACITE_VERSION_STRING = \"$(cat version.txt)\";" >> version.cpp -echo "const std::string ANTHRACITE_FULL_VERSION_STRING = \"Anthracite/$(cat version.txt)\";" >> version.cpp diff --git a/build_supp/version.txt b/build_supp/version.txt deleted file mode 100644 index 0d91a54..0000000 --- a/build_supp/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.3.0 diff --git a/default_www/docker/favicon.ico b/default_www/docker/favicon.ico deleted file mode 100644 index edcb3e4..0000000 Binary files a/default_www/docker/favicon.ico and /dev/null differ diff --git a/default_www/docker/index.html b/default_www/docker/index.html deleted file mode 100644 index 21e22a5..0000000 --- a/default_www/docker/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - Anthracite - - -
-

Anthracite is Running in Docker!

-

If you are seeing this page, then Anthracite is configured correctly!

-

Add files to the "www" directory in your build step to begin serving your website.

-
diff --git a/default_www/docker_compose/favicon.ico b/default_www/docker_compose/favicon.ico deleted file mode 100644 index edcb3e4..0000000 Binary files a/default_www/docker_compose/favicon.ico and /dev/null differ diff --git a/default_www/docker_compose/index.html b/default_www/docker_compose/index.html deleted file mode 100644 index 3607bbd..0000000 --- a/default_www/docker_compose/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - Anthracite - - -
-

Anthracite is Running in Docker Compose!

-

If you are seeing this page, then Anthracite is configured correctly!

-

Bind-mount a directory to "/www" to begin serving your website.

-
diff --git a/default_www/regular/favicon.ico b/default_www/regular/favicon.ico deleted file mode 100644 index edcb3e4..0000000 Binary files a/default_www/regular/favicon.ico and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 3d71054..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -services: - anthracite-web: - build: . - ports: - - "8080:8080" - volumes: - - type: bind - source: ./default_www/docker_compose/ - target: /www - - type: bind - source: ./build_supp/default_config.cfg - target: /anthracite.cfg diff --git a/format.sh b/format.sh deleted file mode 100755 index 939e22c..0000000 --- a/format.sh +++ /dev/null @@ -1,2 +0,0 @@ -git ls-files -- '*.cpp' '*.h' | xargs clang-format -i -style=file -git diff --exit-code --color diff --git a/lib/backends/backend.hpp b/lib/backends/backend.hpp deleted file mode 100644 index 96d344d..0000000 --- a/lib/backends/backend.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include -#include "../http/request.hpp" -#include "../http/response.hpp" - -namespace anthracite::backends { - -class backend { -public: - backend() = default; - virtual ~backend() = default; - backend(backend const&) = delete; - backend& operator = (backend const&) = delete; - backend(backend&&) = delete; - backend& operator=(backend&&) = delete; - virtual std::unique_ptr handle_request(http::request& req) = 0; -}; - -}; diff --git a/lib/backends/file_backend.cpp b/lib/backends/file_backend.cpp deleted file mode 100644 index 5999b51..0000000 --- a/lib/backends/file_backend.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "./file_backend.hpp" -#include "../log/log.hpp" -#include -#include - -namespace anthracite::backends { - -std::unique_ptr file_backend::handle_request_cache(http::request& req) -{ - std::string filename = req.path() == "/" ? "/index.html" : req.path(); - filename = file_dir + filename; - auto file_info = file_cache.find(filename); - - int status = http::status_codes::OK; - if (file_info == file_cache.end()) { - return handle_error(http::status_codes::NOT_FOUND); - } - - std::unique_ptr resp = std::make_unique(); - - std::string file_extension = file_info->first.substr(file_info->first.rfind('.') + 1); - std::string content_type = "text/html"; - - auto mime_type = http::mime_types.find(file_extension); - if (mime_type != http::mime_types.end()) { - content_type = mime_type->second; - } - - resp->add_body_ref(&file_info->second); - resp->add_status(http::status_codes::OK); - resp->add_header(http::header("Content-Type", content_type), false); - - return resp; -} - -void file_backend::populate_cache_dir(std::string dir) -{ - std::filesystem::recursive_directory_iterator cur = begin(std::filesystem::recursive_directory_iterator(dir)); - std::filesystem::recursive_directory_iterator fin = end(std::filesystem::recursive_directory_iterator(dir)); - - while (cur != fin) { - auto p = cur->path(); - std::string filename = p.string(); - std::stringstream buffer; - std::ifstream stream(filename); - buffer << stream.rdbuf(); - file_cache[filename] = buffer.str(); - log::verbose << "File at " << filename << " cached (" << file_cache[filename].size() << " bytes)" << std::endl; - ++cur; - } -} - -void file_backend::populate_cache() -{ - populate_cache_dir(file_dir); - populate_cache_dir("./error_pages/"); -} - -file_backend::file_backend(std::string dir) - : file_dir(std::move(dir)) -{ - populate_cache(); -} - -std::unique_ptr file_backend::handle_request(http::request& req) -{ - return handle_request_cache(req); -} - -std::unique_ptr file_backend::handle_error(const http::status_codes& error) -{ - std::string filename = "./error_pages/" + std::to_string(error) + ".html"; - auto file_info = file_cache.find(filename); - - http::status_codes status = error; - if (file_info == file_cache.end()) { - status = http::status_codes::NOT_FOUND; - filename = "./error_pages/404.html"; - file_info = file_cache.find(filename); - } - - std::unique_ptr resp = std::make_unique(); - - resp->add_body_ref(&file_info->second); - resp->add_status(error); - resp->add_header(http::header("Content-Type", "text/html"), false); - - return resp; -} - -}; diff --git a/lib/backends/file_backend.hpp b/lib/backends/file_backend.hpp deleted file mode 100644 index 955d394..0000000 --- a/lib/backends/file_backend.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "backend.hpp" - -namespace anthracite::backends { - -class file_backend : public backend { -private: - std::unordered_map file_cache; - std::string file_dir; - - std::unique_ptr handle_request_cache(http::request& req); - void populate_cache_dir(std::string dir); - void populate_cache(); -public: - file_backend(std::string dir = "./www") ; - - std::unique_ptr handle_request(http::request& req) override; - std::unique_ptr handle_error(const http::status_codes& error); -}; - -}; diff --git a/lib/http/constants.hpp b/lib/http/constants.hpp deleted file mode 100644 index 2cf61eb..0000000 --- a/lib/http/constants.hpp +++ /dev/null @@ -1,244 +0,0 @@ -#pragma once - -#include -#include - -namespace anthracite::http { - -constexpr int HEADER_BYTES = 8190; - -enum method { - GET, - POST, - DELETE, - PUT, - PATCH, - HEAD, - OPTIONS, - CONNECT, - TRACE, - COPY, - LINK, - UNLINK, - PURGE, - LOCK, - UNLOCK, - PROPFIND, - VIEW, - UNKNOWN -}; - -enum status_codes { - CONTINUE = 100, - SWITCHING_PROTOCOLS = 101, - PROCESSING = 102, - EARLY_HINTS = 103, - OK = 200, - CREATED = 201, - ACCEPTED = 202, - NON_AUTHORITATIVE_INFORMATION = 203, - NO_CONTENT = 204, - RESET_CONTENT = 205, - PARTIAL_CONTENT = 206, - MULTI_STATUS = 207, - ALREADY_REPORTED = 208, - IM_USED = 226, - MULTIPLE_CHOICES = 300, - MOVED_PERMANENTLY = 301, - FOUND = 302, - SEE_OTHER = 303, - NOT_MODIFIED = 304, - USE_PROXY = 305, - TEMPORARY_REDIRECT = 307, - PERMANENT_REDIRECT = 308, - BAD_REQUEST = 400, - UNAUTHORIZED = 401, - PAYMENT_REQUIRED = 402, - FORBIDDEN = 403, - NOT_FOUND = 404, - METHOD_NOT_ALLOWED = 405, - NOT_ACCEPTABLE = 406, - PROXY_AUTHENTICATION_REQUIRED = 407, - REQUEST_TIMEOUT = 408, - CONFLICT = 409, - GONE = 410, - LENGTH_REQUIRED = 411, - PRECONDITION_FAILED = 412, - PAYLOAD_TOO_LARGE = 413, - URI_TOO_LONG = 414, - UNSUPPORTED_MEDIA_TYPE = 415, - RANGE_NOT_SATISFIABLE = 416, - EXPECTATION_FAILED = 417, - I_AM_A_TEAPOT = 418, - ENHANCE_YOUR_CALM = 420, - MISDIRECTED_REQUEST = 421, - UNPROCESSABLE_ENTITY = 422, - LOCKED = 423, - FAILED_DEPENDENCY = 424, - TOO_EARLY = 425, - UPGRADE_REQUIRED = 426, - PRECONDITION_REQUIRED = 428, - TOO_MANY_REQUESTS = 429, - REQUEST_HEADER_FIELDS_TOO_LARGE = 431, - UNAVAILABLE_FOR_LEGAL_REASONS = 451, - INTERNAL_SERVER_ERROR = 500, - NOT_IMPLEMENTED = 501, - BAD_GATEWAY = 502, - SERVICE_UNAVAILABLE = 503, - GATEWAY_TIMEOUT = 504, - HTTP_VERSION_NOT_SUPPORTED = 505, - VARIANT_ALSO_NEGOTIATES = 506, - INSUFFICIENT_STORAGE = 507, - LOOP_DETECTED = 508, - NOT_EXTENDED = 510, - NETWORK_AUTHENTICATION_REQUIRED = 511 -}; - -static std::unordered_map const method_map = { - { "GET", method::GET }, - { "POST", method::POST }, - { "DELETE", method::DELETE }, - { "PUT", method::PUT }, - { "PATCH", method::PATCH }, - { "HEAD", method::HEAD }, - { "OPTIONS", method::OPTIONS }, - { "CONNECT", method::CONNECT }, - { "TRACE", method::TRACE }, - { "COPY", method::COPY }, - { "LINK", method::LINK }, - { "UNLINK", method::UNLINK }, - { "PURGE", method::PURGE }, - { "LOCK", method::LOCK }, - { "UNLOCK", method::UNLOCK }, - { "PROPFIND", method::PROPFIND }, - { "VIEW", method::VIEW }, - { "UNKNOWN", method::UNKNOWN } -}; - -static std::unordered_map const reverse_method_map = { - { method::GET, "GET" }, - { method::POST, "POST" }, - { method::DELETE, "DELETE" }, - { method::PUT, "PUT" }, - { method::PATCH, "PATCH" }, - { method::HEAD, "HEAD" }, - { method::OPTIONS, "OPTIONS" }, - { method::CONNECT, "CONNECT" }, - { method::TRACE, "TRACE" }, - { method::COPY, "COPY" }, - { method::LINK, "LINK" }, - { method::UNLINK, "UNLINK" }, - { method::PURGE, "PURGE" }, - { method::LOCK, "LOCK" }, - { method::UNLOCK, "UNLOCK" }, - { method::PROPFIND, "PROPFIND" }, - { method::VIEW, "VIEW" }, - { method::UNKNOWN, "UNKNOWN" } -}; - -static std::unordered_map const status_map = { - { 100, "CONTINUE" }, - { 101, "SWITCHING PROTOCOLS" }, - { 200, "OK" }, - { 201, "CREATED" }, - { 202, "ACCEPTED" }, - { 203, "NON-AUTHORITATIVE INFORMATION" }, - { 204, "NO CONTENT" }, - { 205, "RESET CONTENT" }, - { 206, "PARTIAL CONTENT" }, - { 300, "MULTIPLE CHOICES" }, - { 301, "MOVED PERMANENTLY" }, - { 302, "FOUND" }, - { 303, "SEE OTHER" }, - { 304, "NOT MODIFIED" }, - { 305, "USE PROXY" }, - { 307, "TEMPORARY REDIRECT" }, - { 400, "BAD REQUEST" }, - { 401, "UNAUTHORIZED" }, - { 402, "PAYMENT REQUIRED" }, - { 403, "FORBIDDEN" }, - { 404, "NOT FOUND" }, - { 405, "METHOD NOT ALLOWED" }, - { 406, "NOT ACCEPTABLE" }, - { 407, "PROXY AUTHENTICATION REQUIRED" }, - { 408, "REQUEST TIMEOUT" }, - { 409, "CONFLICT" }, - { 410, "GONE" }, - { 411, "LENGTH REQUIRED" }, - { 412, "PRECONDITION FAILED" }, - { 413, "PAYLOAD TOO LARGE" }, - { 414, "URI TOO LONG" }, - { 415, "UNSUPPORTED MEDIA TYPE" }, - { 416, "RANGE NOT SATISFIABLE" }, - { 417, "EXPECTATION FAILED" }, - { 418, "I'M A TEAPOT" }, - { 421, "MISDIRECTED REQUEST" }, - { 422, "UNPROCESSABLE ENTITY" }, - { 423, "LOCKED" }, - { 424, "FAILED DEPENDENCY" }, - { 426, "UPGRADE REQUIRED" }, - { 428, "PRECONDITION REQUIRED" }, - { 429, "TOO MANY REQUESTS" }, - { 431, "REQUEST HEADER FIELDS TOO LARGE" }, - { 451, "UNAVAILABLE FOR LEGAL REASONS" }, - { 500, "INTERNAL SERVER ERROR" }, - { 501, "NOT IMPLEMENTED" }, - { 502, "BAD GATEWAY" }, - { 503, "SERVICE UNAVAILABLE" }, - { 504, "GATEWAY TIMEOUT" }, - { 505, "HTTP VERSION NOT SUPPORTED" }, - { 506, "VARIANT ALSO NEGOTIATES" }, - { 507, "INSUFFICIENT STORAGE" }, - { 508, "LOOP DETECTED" }, - { 510, "NOT EXTENDED" }, - { 511, "NETWORK AUTHENTICATION REQUIRED" }, - { 420, "ENHANCE YOUR CALM" } -}; - -static std::unordered_map const mime_types = { - { "html", "text/html" }, - { "css", "text/css" }, - - { "js", "application/javascript" }, - { "json", "application/json" }, - { "pdf", "application/pdf" }, - - { "ico", "image/x-icon" }, - { "jpg", "image/jpeg" }, - { "jpeg", "image/jpeg" }, - { "png", "image/png" }, - { "gif", "image/gif" }, - { "bmp", "image/bmp" }, - - { "mp4", "video/mp4" }, - { "avi", "video/x-msvideo" }, - { "mkv", "video/x-matroska" }, - { "mov", "video/quicktime" }, - { "wmv", "video/x-ms-wmv" }, -}; - -enum version { HTTP_0_9, - HTTP_1_0, - HTTP_1_1, - HTTP_2_0, - HTTP_3_0 }; - -static std::unordered_map const version_map = { - // This is because HTTP 0.9 didn't specify version in the header - { "", HTTP_0_9 }, - { "HTTP/0.9", HTTP_0_9 }, - { "HTTP/1.0", HTTP_1_0 }, - { "HTTP/1.1", HTTP_1_1 }, - { "HTTP/2.0", HTTP_2_0 }, - { "HTTP/3.0", HTTP_3_0 } -}; - -static std::unordered_map const reverse_version_map = { - { HTTP_0_9, "HTTP/0.9" }, - { HTTP_1_0, "HTTP/1.0" }, - { HTTP_1_1, "HTTP/1.1" }, - { HTTP_2_0, "HTTP/2.0" }, - { HTTP_3_0, "HTTP/3.0" } -}; - -}; diff --git a/lib/http/header_query.hpp b/lib/http/header_query.hpp deleted file mode 100644 index 1afb118..0000000 --- a/lib/http/header_query.hpp +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once -#include - -namespace anthracite::http { - -class name_value { -private: - std::string _name; - std::string _value; - -protected: - name_value() {} - -public: - name_value(std::string name, std::string value) - : _name(std::move(name)) - , _value(std::move(value)) - { - } - virtual ~name_value() = default; - name_value(const name_value&) = default; - name_value& operator=(name_value const&) = default; - name_value(name_value&&) = default; - name_value& operator=(name_value&&) = default; - - std::string& name() { return _name; } - std::string& value() { return _value; } - - virtual std::string to_string() { return ""; } -}; - -class header : public name_value { -public: - header() - : name_value() - { - } - header(std::string name, std::string value) - : name_value(name, value) - { - } - - std::string to_string() override { return name() + ": " + value() + "\r\n"; } -}; - -class query_param : public name_value { -public: - query_param() - : name_value() - { - } - query_param(std::string name, std::string value) - : name_value(name, value) - { - } - - std::string to_string() override { return name() + "=" + value(); } -}; - -}; diff --git a/lib/http/http_request.cpp b/lib/http/http_request.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/lib/http/request.cpp b/lib/http/request.cpp deleted file mode 100644 index ca4b648..0000000 --- a/lib/http/request.cpp +++ /dev/null @@ -1,200 +0,0 @@ -#include "request.hpp" -#include "../log/log.hpp" -#include "constants.hpp" -#include -#include -#include - -namespace anthracite::http { - -void request::parse_header(std::string& raw_line) -{ - auto delim_pos = raw_line.find_first_of(':'); - auto value_pos = raw_line.find_first_not_of(' ', delim_pos + 1); - - std::string header_name = raw_line.substr(0, delim_pos); - std::string header_val = raw_line.substr(value_pos); - - _headers[header_name] = header_val; -} - -void request::parse_query_param(std::string& raw_param) -{ - auto delim_pos = raw_param.find_first_of('='); - auto value_pos = delim_pos + 1; - - std::string query_name = raw_param.substr(0, delim_pos); - std::string query_val = raw_param.substr(value_pos); - - _query_params[query_name] = query_val; -} - -void request::parse_path(char* raw_path) -{ - char* saveptr = nullptr; - char* tok = strtok_r(raw_path, "?", &saveptr); - - if (tok) { - _path = tok; - } - - tok = strtok_r(nullptr, "?", &saveptr); - while (tok) { - std::string rtok(tok); - parse_query_param(rtok); - tok = strtok_r(nullptr, "?", &saveptr); - } -} - -void request::parse_request_line(char* raw_line) -{ - request_line_parser_state state = METHOD; - - char* saveptr = nullptr; - char* tok = strtok_r(raw_line, " \r", &saveptr); - - while (tok) { - switch (state) { - case METHOD: { - auto search = method_map.find(tok); - if (search != method_map.end()) { - _method = search->second; - } else { - _method = method::UNKNOWN; - } - - state = PATH; - break; - }; - - case PATH: { - std::string str_tok(tok); - parse_path(tok); - state = VERSION; - break; - }; - - case VERSION: { - auto search = version_map.find(tok); - if (search != version_map.end()) { - _http_version = search->second; - } else { - _http_version = version::HTTP_1_0; - } - return; - }; - } - tok = strtok_r(nullptr, " \r", &saveptr); - } -} - -request::request(std::string& raw_data, const std::string& client_ip) - : _path("") - , _client_ipaddr(client_ip) -{ - - parser_state state = REQUEST_LINE; - - char* saveptr = nullptr; - char* tok = strtok_r(raw_data.data(), "\r\n", &saveptr); - - while (tok && state != BODY_CONTENT) { - switch (state) { - case REQUEST_LINE: { - parse_request_line(tok); - state = HEADERS; - tok = strtok_r(nullptr, "\n", &saveptr); - break; - }; - case HEADERS: { - if (tok[0] == '\r') { - state = BODY_CONTENT; - } else { - std::string rtok(tok); - rtok.pop_back(); - parse_header(rtok); - tok = strtok_r(nullptr, "\n", &saveptr); - } - break; - }; - case BODY_CONTENT: - break; - } - } - - tok = strtok_r(nullptr, "", &saveptr); - if (tok) { - _body_content = std::string(tok); - } - // if (getline(line_stream, line, '\0')) { - // _body_content = line; - // } -} - -std::string request::path() { return _path; } - -method request::get_method() { return _method; } - -std::string request::client_ip() { return _client_ipaddr; } - -version request::get_http_version() -{ - return _http_version; -} - -bool request::is_supported_version() -{ - return _http_version == HTTP_1_1 || _http_version == HTTP_1_0; -} - -bool request::close_connection() -{ - const auto& header = _headers.find("Connection"); - const bool found = header != _headers.end(); - - if (found && header->second == "close") { - return true; - } - - return false; -} - -std::string request::to_string() -{ - std::string response = ""; - response += reverse_method_map.find(_method)->second + " " + _path; - - if (_query_params.size() > 0) { - response += "?"; - } - - auto qp_map = std::map(_query_params.begin(), _query_params.end()); - auto qp = qp_map.begin(); - while (qp != qp_map.end()) { - response += qp->first + "=" + qp->second; - if (++qp != qp_map.end()) { - response += "&"; - } - } - - response += " " + reverse_version_map.find(_http_version)->second + "\r\n"; - - if (_headers.size() == 0) { - response += "\r\n"; - } - - auto hd_map = std::map(_headers.begin(), _headers.end()); - auto hd = hd_map.begin(); - while (hd != hd_map.end()) { - response += hd->first + ": " + hd->second + "\r\n"; - if (++hd == hd_map.end()) { - response += "\r\n"; - } - } - - response += _body_content; - - return response; -} - -}; diff --git a/lib/http/request.hpp b/lib/http/request.hpp deleted file mode 100644 index 1d425ba..0000000 --- a/lib/http/request.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include -#include -#include "./header_query.hpp" -#include "./constants.hpp" - -namespace anthracite::http { - -class request { -private: - enum request_line_parser_state { - METHOD, PATH, VERSION - }; - - enum parser_state { - REQUEST_LINE, - HEADERS, - BODY_CONTENT - }; - - method _method; - version _http_version; - std::string _path; - std::string _client_ipaddr; - std::string _body_content; - std::unordered_map _headers; - std::unordered_map _query_params; - - void parse_request_line(char* raw_line); - void parse_header(std::string& raw_line); - void parse_path(char* raw_path); - void parse_query_param(std::string& raw_param); - -public: - request(std::string& raw_data, const std::string& client_ip); - std::string path(); - method get_method(); - std::string client_ip(); - version get_http_version(); - bool is_supported_version(); - bool close_connection(); - std::string to_string(); -}; - -}; diff --git a/lib/http/response.cpp b/lib/http/response.cpp deleted file mode 100644 index 0389e19..0000000 --- a/lib/http/response.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "response.hpp" -#include "../version.hpp" -#include "./constants.hpp" - -namespace anthracite::http { - -response::response() {}; - -int response::status_code() { return _status_code; } - -void response::add_body(const std::string body) -{ - _content_noref = body; - _content = &_content_noref; -} - -void response::add_body_ref(std::string* body) -{ - _content = body; -} - -void response::add_header(header header, bool override_existing) -{ - if (override_existing || _headers.find(header.name()) == _headers.end()) { - _headers[header.name()] = header; - } -} - -void response::add_status(int code) -{ - _status_code = code; -} - -std::string& response::content() -{ - return *_content; -} - -std::string response::header_to_string() -{ - std::string response = ""; - response += "HTTP/1.1 " + std::to_string(_status_code) + " " + status_map.find(_status_code)->second + "\r\n"; - - add_header(header("Content-Length", std::to_string(_content->length())), false); - add_header(header("Server", ANTHRACITE_FULL_VERSION_STRING), false); - add_header(header("Origin-Server", ANTHRACITE_FULL_VERSION_STRING), false); - - for (auto header : _headers) { - response += header.second.to_string(); - } - - response += "\r\n"; - - return response; -} - -std::string response::to_string() -{ - return header_to_string() + *_content; -} - -}; diff --git a/lib/http/response.hpp b/lib/http/response.hpp deleted file mode 100644 index bbe8fe7..0000000 --- a/lib/http/response.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include -#include -#include "header_query.hpp" - -namespace anthracite::http { - -class response { -private: - int _status_code; - std::string* _content; - std::string _content_noref; - std::unordered_map _headers; - -public: - response(); - int status_code(); - - void add_body(const std::string body); - void add_body_ref(std::string* body); - void add_status(int); - void add_header(header header, bool override_existing = true); - std::string& content(); - std::string header_to_string(); - std::string to_string(); -}; - -}; diff --git a/lib/log/log.cpp b/lib/log/log.cpp deleted file mode 100644 index 2fba0fd..0000000 --- a/lib/log/log.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include "./log.hpp" - -namespace anthracite::log { -enum LOG_LEVEL Logger::_level = LOG_LEVEL_NONE; - -// TODO: implement logger as a singleton to prevent duplicates -Logger::Logger() = default; -void Logger::initialize(enum LOG_LEVEL level) -{ - _level = level; -} - -void Logger::log_request_and_response(http::request& req, std::unique_ptr& resp, uint32_t micros) -{ - log::info << "[" << resp->status_code() << " " + http::status_map.find(resp->status_code())->second + "] " + req.client_ip() + " " + http::reverse_method_map.find(req.get_method())->second + " " + req.path() << " in " << micros << " usecs" << std::endl; -} - -LogBuf::LogBuf(std::ostream& output_stream, const std::string& tag, enum LOG_LEVEL level) - : _output_stream(output_stream) - , _tag(tag) - , _level(level) -{ -} - -int LogBuf::sync() -{ - if (this->_level <= logger._level) { - char thread_name[100]; - pthread_getname_np(pthread_self(), thread_name, 100); - _output_stream << "[" << this->_tag << "] [" << syscall(SYS_gettid) << ":" << thread_name << "] " << this->str(); - _output_stream.flush(); - } - this->str(""); - return 0; -} -}; diff --git a/lib/log/log.hpp b/lib/log/log.hpp deleted file mode 100644 index d9fd1e4..0000000 --- a/lib/log/log.hpp +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include "../http/request.hpp" -#include "../http/response.hpp" - -namespace anthracite::log { - enum LOG_LEVEL { - LOG_LEVEL_NONE = 0, - LOG_LEVEL_ERROR = 1, - LOG_LEVEL_WARN = 2, - LOG_LEVEL_INFO = 3, - LOG_LEVEL_VERBOSE = 4, - LOG_LEVEL_DEBUG = 5 - }; - - class Logger { - friend class LogBuf; - static enum LOG_LEVEL _level; - public: - - Logger(); - void initialize(enum LOG_LEVEL level); - void log_request_and_response(http::request& req, std::unique_ptr& resp, uint32_t micros); - }; - - class LogBuf : public std::stringbuf - { - std::string _tag; - std::ostream& _output_stream; - enum LOG_LEVEL _level; - public: - LogBuf(std::ostream& output_stream, const std::string& tag, enum LOG_LEVEL level); - int sync() override; - }; - - static class Logger logger{}; - - static class LogBuf errBuf{std::cerr, "EROR", LOG_LEVEL_ERROR}; - static std::ostream err(&errBuf); - - static class LogBuf warnBuf{std::cerr, "WARN", LOG_LEVEL_WARN}; - static std::ostream warn(&warnBuf); - - static class LogBuf infoBuf{std::cout, "INFO", LOG_LEVEL_INFO}; - static std::ostream info(&infoBuf); - - static class LogBuf verboseBuf{std::cout, "VERB", LOG_LEVEL_VERBOSE}; - static std::ostream verbose(&verboseBuf); - - static class LogBuf debugBuf{std::cout, "DEBG", LOG_LEVEL_DEBUG}; - static std::ostream debug(&debugBuf); - - -}; diff --git a/lib/socket/openssl_socket.cpp b/lib/socket/openssl_socket.cpp deleted file mode 100644 index 775f170..0000000 --- a/lib/socket/openssl_socket.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "./openssl_socket.hpp" -#include "../log/log.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace anthracite::socket { - -openssl_listener::openssl_listener(std::string& key_path, std::string& cert_path, int port, int max_queue, bool nonblocking) - : listener(port, max_queue, nonblocking) -{ - const SSL_METHOD* method = TLS_server_method(); - - _context = SSL_CTX_new(method); - - if (!_context) { - log::err << "Unable to initialize SSL" << std::endl; - throw std::exception(); - } - - if (SSL_CTX_use_certificate_file(_context, cert_path.c_str(), SSL_FILETYPE_PEM) <= 0) { - log::err << "Unable to open Cert file at: " << cert_path << std::endl; - throw std::exception(); - } - - if (SSL_CTX_use_PrivateKey_file(_context, key_path.c_str(), SSL_FILETYPE_PEM) <= 0) { - log::err << "Unable to open Key file at: " << key_path << std::endl; - throw std::exception(); - } -} - -bool openssl_listener::wait_for_conn(server** client_sock_p) -{ - struct sockaddr_in client_addr {}; - socklen_t client_addr_len; - - int csock = accept(_sock_fd, reinterpret_cast(&client_addr), &client_addr_len); - - if (csock > 0) { - std::array ip_str { 0 }; - - if (inet_ntop(AF_INET, &client_addr.sin_addr, ip_str.data(), INET_ADDRSTRLEN) == NULL) { - if (inet_ntop(AF_INET6, &client_addr.sin_addr, ip_str.data(), INET6_ADDRSTRLEN) == NULL) { - log::warn << "Unable to decode client's IP address" << std::endl; - } - } - - SSL* ssl = SSL_new(_context); - - if (ssl == NULL) { - for (int i = 0; i < 5 && close(csock) != 0; ++i) - ; - return false; - } - - if (SSL_set_fd(ssl, csock) == 0) { - SSL_free(ssl); - for (int i = 0; i < 5 && close(csock) != 0; ++i) - ; - return false; - } - - if (SSL_accept(ssl) <= 0) { - log::warn << "Unable to open SSL connection with client" << std::endl; - SSL_free(ssl); - for (int i = 0; i < 5 && close(csock) != 0; ++i) - ; - return false; - } - - std::string client_ip = std::string(ip_str.data()); - *client_sock_p = new openssl_server(csock, client_ip, _nonblocking, ssl); - return true; - } else { - return false; - } -} - -openssl_listener::~openssl_listener() {} - -openssl_server::openssl_server(int sock_fd, std::string client_ip, bool nonblocking, SSL* ssl) - : server(sock_fd, client_ip, nonblocking) - , _ssl(ssl) -{ -} - -openssl_server::~openssl_server() -{ - SSL_shutdown(_ssl); - SSL_free(_ssl); -} - -void openssl_server::send_message(const std::string& msg) -{ - SSL_write(_ssl, &msg[0], msg.length()); -} - -std::string openssl_server::recv_message(int buffer_size) -{ - // Ignored because it's nonfatal, just slower - int nodelay_opt = 1; - (void)setsockopt(_sock_fd, SOL_TCP, TCP_NODELAY, &nodelay_opt, sizeof(nodelay_opt)); - - std::vector response(buffer_size + 1); - ssize_t result = SSL_read(_ssl, response.data(), buffer_size + 1); - - if (result < 1) { - return ""; - } - - response[buffer_size] = '\0'; - return { response.data() }; -} - -}; diff --git a/lib/socket/openssl_socket.hpp b/lib/socket/openssl_socket.hpp deleted file mode 100644 index 24d135a..0000000 --- a/lib/socket/openssl_socket.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "./socket.hpp" -#include -#include - -namespace anthracite::socket { -class openssl_server : public server{ - private: - SSL* _ssl; - public: - openssl_server(int sock_fd, std::string client_ip, bool nonblocking, SSL* ssl); - ~openssl_server(); - - void send_message(const std::string& msg) override; - std::string recv_message(int buffer_size) override; -}; - -class openssl_listener : public listener { - private: - SSL_CTX* _context; - - public: - openssl_listener(std::string& key_path, std::string& cert_path, int port, int max_queue_length, bool nonblocking); - ~openssl_listener(); - - bool wait_for_conn(server** client_sock_) override; -}; -}; diff --git a/lib/socket/socket.cpp b/lib/socket/socket.cpp deleted file mode 100644 index acf9bf4..0000000 --- a/lib/socket/socket.cpp +++ /dev/null @@ -1,144 +0,0 @@ -#include "./socket.hpp" -#include "../log/log.hpp" -#include "assert.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace anthracite::socket { - -socket::socket(bool nonblocking) - : _nonblocking(nonblocking) -{ -} - -listener::listener(int port, int max_queue, bool nonblocking) - : socket(nonblocking) - , _port(port) -{ - _sock_fd = ::socket(AF_INET, SOCK_STREAM, 0); - - if (_sock_fd == -1) { - log::err << "Listener was unable to open a socket" << std::endl; - throw std::exception(); - } - - struct sockaddr_in address {}; - address.sin_family = AF_INET; - address.sin_port = htons(_port); - address.sin_addr.s_addr = INADDR_ANY; - - int reuse_opt = 1; - if (setsockopt(_sock_fd, SOL_SOCKET, SO_REUSEADDR, &reuse_opt, sizeof(reuse_opt)) < 0) { - log::err << "Listener was unable to set SO_REUSEADDR" << std::endl; - throw std::exception(); - } - - if (bind(_sock_fd, reinterpret_cast(&address), sizeof(address)) != 0) { - log::err << "Listener was unable to bind to address" << std::endl; - throw std::exception(); - } - - if (fcntl(_sock_fd, F_SETFL, O_NONBLOCK) == -1) { - log::err << "Listener was unable to fcntl(O_NONBLOCK)" << std::endl; - throw std::exception(); - } - - if (listen(_sock_fd, max_queue) == -1) { - log::err << "Listener was unable to begin listening" << std::endl; - throw std::exception(); - } -} - -bool listener::wait_for_conn(server** client_sock_p) -{ - struct sockaddr_in client_addr {}; - socklen_t client_addr_len; - - int csock = accept(_sock_fd, reinterpret_cast(&client_addr), &client_addr_len); - - if (csock > 0) { - std::array ip_str { 0 }; - - if (inet_ntop(AF_INET, &client_addr.sin_addr, ip_str.data(), INET_ADDRSTRLEN) == NULL) { - if (inet_ntop(AF_INET6, &client_addr.sin_addr, ip_str.data(), INET6_ADDRSTRLEN) == NULL) { - log::warn << "Unable to decode client's IP address" << std::endl; - } - } - - std::string client_ip = std::string(ip_str.data()); - *client_sock_p = new server(csock, client_ip, _nonblocking); - - return true; - } else { - return false; - } -} - -server::server(int sock_fd, std::string client_ip, bool nonblocking) - : _sock_fd(sock_fd) - , _client_ip(std::move(client_ip)) - , socket(nonblocking) -{ - if (_nonblocking) { - if (fcntl(_sock_fd, F_SETFL, O_NONBLOCK) == -1) { - log::err << "Server was unable to fcntl(O_NONBLOCK)" << std::endl; - throw std::exception(); - } - } -} - -void server::send_message(const std::string& msg) -{ - // Ignored because if we fail to send, it probably means - // a HUP will occur and it'll be closed. TODO: Just close - // it here and add a return value - (void)send(_sock_fd, &msg[0], msg.length(), 0); -} - -std::string server::recv_message(int buffer_size) -{ - // Ignored because it's nonfatal, just slower - int nodelay_opt = 1; - (void)setsockopt(_sock_fd, SOL_TCP, TCP_NODELAY, &nodelay_opt, sizeof(nodelay_opt)); - - std::vector response(buffer_size + 1); - ssize_t result = recv(_sock_fd, response.data(), buffer_size + 1, 0); - - if (result < 1) { - return ""; - } - - response[buffer_size] = '\0'; - return { response.data() }; -} - -server::~server() -{ - for (int i = 0; i < 5 && close(_sock_fd) != 0; ++i) - ; -} - -listener::~listener() -{ - for (int i = 0; i < 5 && close(_sock_fd) != 0; ++i) - ; -} - -const std::string& server::client_ip() -{ - return _client_ip; -} - -}; diff --git a/lib/socket/socket.hpp b/lib/socket/socket.hpp deleted file mode 100644 index 18590d3..0000000 --- a/lib/socket/socket.hpp +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -namespace anthracite::socket { - -class socket { - protected: - bool _nonblocking; - socket(bool nonblocking); - public: - socket(){} - virtual ~socket(){} -}; - -class server : public socket { - protected: - int _sock_fd; - std::string _client_ip; - public: - server(int sock_fd, std::string client_ip, bool nonblocking); - ~server(); - - virtual void send_message(const std::string& msg); - virtual std::string recv_message(int buffer_size); - const std::string& client_ip(); - - int fd() { return _sock_fd; } -}; - -class listener : public socket { - protected: - uint16_t _port; - int _sock_fd; - public: - listener(int port, int max_queue_length, bool nonblocking); - ~listener(); - - virtual bool wait_for_conn(server** client_sock_p); - - int fd() { return _sock_fd; } - int port() { return _port; } -}; - -}; diff --git a/lib/thread_mgr/event_loop.cpp b/lib/thread_mgr/event_loop.cpp deleted file mode 100644 index a78956e..0000000 --- a/lib/thread_mgr/event_loop.cpp +++ /dev/null @@ -1,138 +0,0 @@ -#include "./event_loop.hpp" -#include "../log/log.hpp" -#include "assert.h" -#include "signal.h" -#include "sys/epoll.h" -#include -#include -#include -#include -#include -#include - -using std::chrono::duration; -using std::chrono::duration_cast; -using std::chrono::high_resolution_clock; -using std::chrono::milliseconds; - -namespace anthracite::thread_mgr { - -event_loop::event_loop(std::vector& listen_sockets, backends::backend& backend, int max_threads, int max_clients) - : thread_mgr(backend) - , _error_backend("./www") - , _max_threads(max_threads) - , _listen_sockets(listen_sockets) - , _max_clients(max_clients) - , _nonblocking(false) -{ -} - -bool event_loop::event_handler(socket::server* sock) -{ - std::string raw_request = sock->recv_message(http::HEADER_BYTES); - - if (raw_request == "") { - return false; - } - - http::request req(raw_request, sock->client_ip()); - std::unique_ptr resp = req.is_supported_version() ? _backend.handle_request(req) : _error_backend.handle_error(http::status_codes::HTTP_VERSION_NOT_SUPPORTED); - std::string header = resp->header_to_string(); - sock->send_message(header); - sock->send_message(resp->content()); - - if (req.close_connection()) { - return false; - } - - return true; -} - -void event_loop::worker_thread_loop(int threadno) -{ - std::stringstream ss; - ss << "worker " << threadno; - pthread_setname_np(pthread_self(), ss.str().c_str()); - - struct epoll_event* events = new struct epoll_event[_max_clients]; - int timeout_ms = 1000; - - if (_nonblocking) { - timeout_ms = 0; - } - - std::osyncstream(log::info) << "Starting worker thread " << threadno << std::endl; - - int epoll_fd = epoll_create(1); - - for (socket::listener* sl : _listen_sockets) { - struct epoll_event event; - event.events = EPOLLIN | EPOLLEXCLUSIVE; - event.data.ptr = sl; - epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sl->fd(), &event); - if (threadno == 0) { - std::osyncstream(log::info) << "Listening started on port " << sl->port() << std::endl; - } - } - - while (_run) { - int ready_fds = epoll_wait(epoll_fd, events, _max_clients, timeout_ms); - - if (ready_fds > 0) { - for (int i = 0; i < ready_fds; i++) { - socket::socket* sockptr = reinterpret_cast(events[i].data.ptr); - socket::server* server_ptr = dynamic_cast(sockptr); - - if (server_ptr != nullptr) { - if (!event_handler(server_ptr)) { - delete server_ptr; - } - } else { - socket::listener* listen_ptr = dynamic_cast(sockptr); - if (listen_ptr != nullptr) { - socket::server* server_sock; - while (listen_ptr->wait_for_conn(&server_sock)) { - struct epoll_event event; - event.events = EPOLLIN | EPOLLEXCLUSIVE; - event.data.ptr = server_sock; - epoll_ctl(epoll_fd, EPOLL_CTL_ADD, server_sock->fd(), &event); - } - } else { - std::osyncstream(log::err) << "Had socket type that wasn't listener or server" << std::endl; - } - } - } - } - } - - delete[] events; - - std::osyncstream(log::info) << "Stopping worker thread " << threadno << std::endl; -} - -void event_loop::start() -{ - std::lock_guard lg(_run_lock); - - signal(SIGPIPE, SIG_IGN); - log::info << "Starting event_loop Thread Manager" << std::endl; - - _run = true; - - std::vector worker_threads; - - for (int i = 0; i < _max_threads; i++) { - auto thread = std::thread(&event_loop::worker_thread_loop, this, i); - worker_threads.push_back(std::move(thread)); - } - - for (std::thread& t : worker_threads) { - t.join(); - } -} - -void event_loop::stop() -{ - _run = false; -} -} diff --git a/lib/thread_mgr/event_loop.hpp b/lib/thread_mgr/event_loop.hpp deleted file mode 100644 index 41c3a18..0000000 --- a/lib/thread_mgr/event_loop.hpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "./thread_mgr.hpp" -#include "../socket/socket.hpp" -#include "../backends/file_backend.hpp" -#include -#include -#include "../socket/socket.hpp" - -namespace anthracite::thread_mgr { - class event_loop : public virtual thread_mgr { - std::mutex _event_mtx; - backends::file_backend _error_backend; - std::vector& _listen_sockets; - bool _nonblocking; - std::mutex _run_lock; - int _max_threads; - int _max_clients; - - void worker_thread_loop(int threadno); - bool event_handler(socket::server*); - - public: - event_loop(std::vector&, backends::backend& backend, int max_workers, int max_clients); - void start() override; - void stop() override; - }; -}; diff --git a/lib/thread_mgr/thread_mgr.hpp b/lib/thread_mgr/thread_mgr.hpp deleted file mode 100644 index cbb7614..0000000 --- a/lib/thread_mgr/thread_mgr.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "../backends/backend.hpp" - -namespace anthracite::thread_mgr { - class thread_mgr { - protected: - bool _run; - backends::backend& _backend; - public: - thread_mgr(backends::backend& backend): _backend(backend) {} - virtual ~thread_mgr() = default; - virtual void start() = 0; - virtual void stop() = 0; - }; -}; diff --git a/lib/version.hpp b/lib/version.hpp deleted file mode 100644 index 00c406a..0000000 --- a/lib/version.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include - -extern const std::string ANTHRACITE_VERSION_STRING; -extern const std::string ANTHRACITE_FULL_VERSION_STRING; diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 4fd6aa6..0000000 --- a/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs ? import {} }: - pkgs.mkShell { - nativeBuildInputs = [ pkgs.pkg-config pkgs.openssl pkgs.libgcc pkgs.boost pkgs.cmake pkgs.python312 pkgs.cmake pkgs.gnumake ]; - - shellHook = '' - export OPENSSL_DIR="${pkgs.openssl.dev}" - export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig" - export OPENSSL_NO_VENDOR=1 - export OPENSSL_LIB_DIR="${pkgs.lib.getLib pkgs.openssl}/lib" - ''; -} diff --git a/.clang-format b/src/.clang-format similarity index 100% rename from .clang-format rename to src/.clang-format diff --git a/.clang-tidy b/src/.clang-tidy similarity index 100% rename from .clang-tidy rename to src/.clang-tidy diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..b31b9d0 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,25 @@ +.PHONY: format lint build build-release build-docker run debug + +build: + g++ main.cpp -g -o ./anthracite + +build-release: + g++ main.cpp -O3 -march=native -o ./anthracite + +build-docker: + docker build . -t anthracite + +run: build + ./anthracite 8080 + +debug: build + gdb --args ./anthracite 8080 + +format: + clang-format *.cpp -i + +lint: + clang-tidy *.cpp + +lint-fix: + clang-tidy *.cpp -fix -fix-errors diff --git a/src/backends/backend.cpp b/src/backends/backend.cpp new file mode 100644 index 0000000..e15576d --- /dev/null +++ b/src/backends/backend.cpp @@ -0,0 +1,7 @@ +#include "../http.cpp" +#include + +class backend { +public: + virtual unique_ptr handle_request(http_request& req) = 0; +}; diff --git a/src/backends/file_backend.cpp b/src/backends/file_backend.cpp new file mode 100644 index 0000000..a0eb5ad --- /dev/null +++ b/src/backends/file_backend.cpp @@ -0,0 +1,72 @@ +#include "backend.cpp" +#include + +class file_backend : public backend { +private: + unordered_map file_cache; + bool cache_enabled; + + unique_ptr handle_request_nocache(http_request& req) { + string filename = req.path() == "/" ? "index.html" : req.path(); + filename = "./www/" + filename; + ifstream stream(filename); + + int status = 200; + if (!stream.is_open()) { + status = 404; + filename = "./error_pages/404.html"; + stream = ifstream(filename); + } + + stringstream buffer; + buffer << stream.rdbuf(); + return make_unique(buffer.str(), status); + } + + unique_ptr handle_request_cache(http_request& req) { + string filename = req.path() == "/" ? "/index.html" : req.path(); + filename = "./www" + filename; + auto file_info = file_cache.find(filename); + + int status = 200; + if (file_info == file_cache.end()) { + status = 404; + filename = "./error_pages/404.html"; + file_info = file_cache.find(filename); + } + + return make_unique(file_info->second, status); + } + + void populate_cache_dir(string dir) { + filesystem::recursive_directory_iterator cur = begin(filesystem::recursive_directory_iterator(dir)); + filesystem::recursive_directory_iterator fin = end(filesystem::recursive_directory_iterator(dir)); + + while (cur != fin) { + auto p = cur->path(); + string filename = p.string(); + stringstream buffer; + ifstream stream(filename); + buffer << stream.rdbuf(); + file_cache[filename] = buffer.str(); + cout << "File at " << filename << " cached (" << file_cache[filename].size() << " bytes)" << endl; + ++cur; + } + } + + void populate_cache() { + populate_cache_dir("./www/"); + populate_cache_dir("./error_pages/"); + } + +public: + file_backend(bool enable_cache) : cache_enabled(enable_cache) { + if(cache_enabled) { + populate_cache(); + } + } + + unique_ptr handle_request(http_request& req) override { + return cache_enabled ? handle_request_cache(req) : handle_request_nocache(req); + } +}; diff --git a/src/error_pages/404.html b/src/error_pages/404.html new file mode 100644 index 0000000..50cdb27 --- /dev/null +++ b/src/error_pages/404.html @@ -0,0 +1,12 @@ + + Not Found + + +
+

404 - Not Found

+
+

Anthracite/0.0.1

+

Created by Nicholas Orlowsky - This is Open Source Software

+
+ + diff --git a/src/error_pages/500.html b/src/error_pages/500.html new file mode 100644 index 0000000..19ee712 --- /dev/null +++ b/src/error_pages/500.html @@ -0,0 +1,12 @@ + + Not Found + + +
+

500 - Internal Server Error

+
+

Anthracite/0.0.1

+

Created by Nicholas Orlowsky - This is Open Source Software

+
+ + diff --git a/src/file_main.cpp b/src/file_main.cpp deleted file mode 100644 index d7e5492..0000000 --- a/src/file_main.cpp +++ /dev/null @@ -1,304 +0,0 @@ -#include "../lib/backends/file_backend.hpp" -#include "../lib/log/log.hpp" -#include "../lib/socket/openssl_socket.hpp" -#include "../lib/socket/socket.hpp" -#include "../lib/thread_mgr/event_loop.hpp" -#include "signal.h" -#include "getopt.h" -#include -#include -#include -#include -#include -#include -#include - -struct event_loop_config { - int max_workers; - int max_clients; -}; - -struct server_config { - std::unordered_map listeners; - std::optional event_loop; - std::string serve_dir = "./www"; - enum anthracite::log::LOG_LEVEL log_level = anthracite::log::LOG_LEVEL_INFO; -}; - -std::shared_ptr server = nullptr; - -extern "C" void signalHandler(int signum) -{ - anthracite::log::warn << "Caught signal SIGIN, exiting Anthracite" << std::endl; - if (server != nullptr) { - server->stop(); - } -} - -bool read_config(server_config& config, const std::string& config_path) -{ - std::ifstream config_stream(config_path); - if (!config_stream.is_open()) { - anthracite::log::err << "Unable to open configuration file at '" << config_path << "', ensure that the file exists and permissions are set correctly" << std::endl; - return false; - } - - std::string line; - for (int lineno = 1; std::getline(config_stream, line); lineno++) { - bool parse_failed = false; - - std::stringstream ss_line(line); - std::string directive; - ss_line >> directive; - - if (ss_line.fail()) { - continue; - } - - if (directive == "http" || directive == "https") { - // http PORT QUEUE_LEN NONBLOCK - // https PORT QUEUE_LEN NONBLOCK CRT_PATH KEY_PATH - int port; - int queue_len; - std::string block; - std::string crt_path; - std::string key_path; - ss_line >> port >> queue_len >> block; - - if (directive == "https") { - ss_line >> crt_path >> key_path; - } - - bool nonblocking = false; - if (block == "blocking") { - nonblocking = false; - } else if (block == "nonblocking") { - nonblocking = true; - } else { - anthracite::log::err << "BLOCK is not a string of value blocking or nonblocking"; - parse_failed = true; - } - - parse_failed |= ss_line.fail(); - parse_failed |= !ss_line.eof(); - - if (parse_failed) { - anthracite::log::err << "Invalid http/https config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "Format is: " << std::endl; - anthracite::log::err << "http PORT QUEUE_LENGTH BLOCK" << std::endl; - anthracite::log::err << "https PORT QUEUE_LENGTH BLOCK CRT_PATH KEY_PATH" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "PORT, QUEUE_LENGTH are integers" << std::endl; - anthracite::log::err << "BLOCK is a string of value blocking or nonblocking" << std::endl; - anthracite::log::err << "CRT_PATH and KEY_PATH are strings for the path or the certificate and key files respectively" << std::endl; - anthracite::log::err << std::endl - << "Line was: " << std::endl - << line << std::endl; - anthracite::log::err << "Check for trailing whitespace!" << std::endl; - return false; - } - - if (config.listeners.contains(port)) { - anthracite::log::err << "Invalid http/https config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << "Port " << port << " is already being used" << std::endl; - return false; - } - - if (directive == "https") { - config.listeners[port] = new anthracite::socket::openssl_listener(key_path, crt_path, port, queue_len, nonblocking); - } else { - config.listeners[port] = new anthracite::socket::listener(port, queue_len, nonblocking); - } - } else if (directive == "log_level") { - // log_level LEVEL - std::string log_level; - ss_line >> log_level; - - parse_failed |= ss_line.fail(); - parse_failed |= !ss_line.eof(); - - if (log_level == "DEBUG") { - config.log_level = anthracite::log::LOG_LEVEL::LOG_LEVEL_DEBUG; - } else if (log_level == "VERBOSE") { - config.log_level = anthracite::log::LOG_LEVEL::LOG_LEVEL_VERBOSE; - } else if (log_level == "INFO") { - config.log_level = anthracite::log::LOG_LEVEL::LOG_LEVEL_INFO; - } else if (log_level == "WARN") { - config.log_level = anthracite::log::LOG_LEVEL::LOG_LEVEL_WARN; - } else if (log_level == "ERROR") { - config.log_level = anthracite::log::LOG_LEVEL::LOG_LEVEL_ERROR; - } else { - parse_failed = true; - } - - if (parse_failed) { - anthracite::log::err << "Invalid log_level config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "Format is: " << std::endl; - anthracite::log::err << "log_level LEVEL" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "LEVEL is string of value DEBUG, VERBOSE, INFO, WARN, ERROR" << std::endl; - anthracite::log::err << std::endl - << "Line was: " << std::endl - << line << std::endl; - anthracite::log::err << "Check for trailing whitespace!" << std::endl; - return false; - } - } else if (directive == "event_loop") { - // event_loop MAX_WORKERS MAX_CLIENS - int max_workers; - int max_clients; - - ss_line >> max_workers >> max_clients; - - parse_failed |= ss_line.fail(); - parse_failed |= !ss_line.eof(); - - if (parse_failed) { - anthracite::log::err << "Invalid event_loop config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "Format is: " << std::endl; - anthracite::log::err << "event_loop MAX_WORKERS MAX_CLIENTS" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "MAX_WORKERS is the maximum number of worker threads" << std::endl; - anthracite::log::err << "MAX_CLIENTS is the maximum number of concurrent clients" << std::endl; - anthracite::log::err << std::endl - << "Line was: " << std::endl - << line << std::endl; - anthracite::log::err << "Check for trailing whitespace!" << std::endl; - return false; - } - - if (max_workers <= 0) { - anthracite::log::err << "Invalid event_loop config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << "MAX_WORKERS must be a positive, nonzero number" << std::endl; - return false; - } - - if (max_clients <= 0) { - anthracite::log::err << "Invalid event_loop config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << "MAX_CLIENTS must be a positive, nonzero number" << std::endl; - return false; - } - - if (config.event_loop.has_value()) { - anthracite::log::err << "Invalid event_loop config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << "A thread manager was already specified. You may only specify one at a time as of now." << std::endl; - return false; - } - - // Eww - config.event_loop = { .max_workers = max_workers, .max_clients = max_clients }; - } else if (directive == "www_dir") { - std::string www_dir; - ss_line >> www_dir; - - parse_failed |= ss_line.fail(); - parse_failed |= !ss_line.eof(); - - if (parse_failed) { - anthracite::log::err << "Invalid www_dir config on line " << lineno << " of configuration file" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "Format is: " << std::endl; - anthracite::log::err << "www_dir PATH" << std::endl; - anthracite::log::err << std::endl; - anthracite::log::err << "PATH is a path to a directory containing files to serve" << std::endl; - anthracite::log::err << std::endl - << "Line was: " << std::endl - << line << std::endl; - anthracite::log::err << "Check for trailing whitespace!" << std::endl; - return false; - } - } else { - anthracite::log::err << "Invalid configuration. Unknown directive " << directive << " on line " << lineno << std::endl; - return false; - } - } - - if (!config.event_loop.has_value()) { - anthracite::log::err << "Invalid configuration. Missing a thread manager. Try adding an event_loop directive." << std::endl; - return false; - } - - if (config.listeners.size() == 0) { - anthracite::log::err << "Invalid configuration. Missing listeners. Try adding a http or https directive." << std::endl; - return false; - } - - return true; -} - -int main(int argc, char* argv[]) -{ - signal(SIGINT, signalHandler); - anthracite::log::logger.initialize(anthracite::log::LOG_LEVEL_INFO); - if (pthread_setname_np(pthread_self(), "main") != 0) { - anthracite::log::err << "Failed to set thread name via pthread_setname_np" << std::endl; - } - - int opt_index = 0; - option options[] = { - { "help", no_argument, 0, 'h' }, - { "config", required_argument, 0, 'c' } - }; - - char c; - std::string config_path = "./anthracite.cfg"; - bool config_set = false; - while ((c = getopt_long(argc, argv, "hc:", options, &opt_index)) != -1) { - switch (c) { - case 'h': { - std::cerr << "Anthracite Help" << std::endl; - std::cerr << std::endl; - std::cerr << "-h, --help Prints this help menu " << std::endl; - std::cerr << std::endl; - std::cerr << "-c, --config string (optional) Specifies the path of the configuration" << std::endl; - std::cerr << " file. Default is './anthracite.cfg'" << std::endl; - std::cerr << std::endl; - return 0; - break; - }; - case 'c': { - if (config_set) { - anthracite::log::err << "You cannot specify multiple configuration files" << std::endl; - return 1; - } - config_set = true; - config_path = std::string(optarg); - break; - }; - } - } - - anthracite::log::info << "Loading configuration file at path '" << config_path << "'" << std::endl; - - server_config cfg; - if (!read_config(cfg, config_path)) { - anthracite::log::err << "Failed reading configuration file at path '" << config_path << "'" << std::endl; - return 1; - } - - anthracite::log::logger.initialize(cfg.log_level); - - anthracite::log::info << "Serving files in directory " << cfg.serve_dir << std::endl; - anthracite::backends::file_backend fb(cfg.serve_dir); - - std::vector listeners; - - for (auto lp : cfg.listeners) { - listeners.push_back(lp.second); - } - - server = std::make_shared(listeners, fb, cfg.event_loop->max_workers, cfg.event_loop->max_clients); - - anthracite::log::info << "Starting Anthracite, a very high performance web server" << std::endl; - - server->start(); - - for (auto listener : listeners) { - delete listener; - } - - anthracite::log::info << "Stopping Anthracite, a very high performance web server" << std::endl; -} diff --git a/src/http.cpp b/src/http.cpp new file mode 100644 index 0000000..7d08a9b --- /dev/null +++ b/src/http.cpp @@ -0,0 +1,418 @@ +#include +#include +#include +#include +#include + +#include "socket.cpp" +#include +#include +#include +#include +#include +#include +#include + +using namespace std; + +constexpr int HTTP_HEADER_BYTES = 8190; + +enum http_method { + GET, + POST, + DELETE, + PUT, + PATCH, + HEAD, + OPTIONS, + CONNECT, + TRACE, + COPY, + LINK, + UNLINK, + PURGE, + LOCK, + UNLOCK, + PROPFIND, + VIEW, + UNKNOWN +}; + +static unordered_map const http_method_map = { + { "GET", http_method::GET }, + { "POST", http_method::POST }, + { "DELETE", http_method::DELETE }, + { "PUT", http_method::PUT }, + { "PATCH", http_method::PATCH }, + { "HEAD", http_method::HEAD }, + { "OPTIONS", http_method::OPTIONS }, + { "CONNECT", http_method::CONNECT }, + { "TRACE", http_method::TRACE }, + { "COPY", http_method::COPY }, + { "LINK", http_method::LINK }, + { "UNLINK", http_method::UNLINK }, + { "PURGE", http_method::PURGE }, + { "LOCK", http_method::LOCK }, + { "UNLOCK", http_method::UNLOCK }, + { "PROPFIND", http_method::PROPFIND }, + { "VIEW", http_method::VIEW }, + { "UNKNOWN", http_method::UNKNOWN } +}; + +static unordered_map const http_reverse_method_map = { + { http_method::GET, "GET" }, + { http_method::POST, "POST" }, + { http_method::DELETE, "DELETE" }, + { http_method::PUT, "PUT" }, + { http_method::PATCH, "PATCH" }, + { http_method::HEAD, "HEAD" }, + { http_method::OPTIONS, "OPTIONS" }, + { http_method::CONNECT, "CONNECT" }, + { http_method::TRACE, "TRACE" }, + { http_method::COPY, "COPY" }, + { http_method::LINK, "LINK" }, + { http_method::UNLINK, "UNLINK" }, + { http_method::PURGE, "PURGE" }, + { http_method::LOCK, "LOCK" }, + { http_method::UNLOCK, "UNLOCK" }, + { http_method::PROPFIND, "PROPFIND" }, + { http_method::VIEW, "VIEW" }, + { http_method::UNKNOWN, "UNKNOWN" } +}; + +static unordered_map const http_status_map = { + { 100, "CONTINUE" }, + { 101, "SWITCHING PROTOCOLS" }, + { 200, "OK" }, + { 201, "CREATED" }, + { 202, "ACCEPTED" }, + { 203, "NON-AUTHORITATIVE INFORMATION" }, + { 204, "NO CONTENT" }, + { 205, "RESET CONTENT" }, + { 206, "PARTIAL CONTENT" }, + { 300, "MULTIPLE CHOICES" }, + { 301, "MOVED PERMANENTLY" }, + { 302, "FOUND" }, + { 303, "SEE OTHER" }, + { 304, "NOT MODIFIED" }, + { 305, "USE PROXY" }, + { 307, "TEMPORARY REDIRECT" }, + { 400, "BAD REQUEST" }, + { 401, "UNAUTHORIZED" }, + { 402, "PAYMENT REQUIRED" }, + { 403, "FORBIDDEN" }, + { 404, "NOT FOUND" }, + { 405, "METHOD NOT ALLOWED" }, + { 406, "NOT ACCEPTABLE" }, + { 407, "PROXY AUTHENTICATION REQUIRED" }, + { 408, "REQUEST TIMEOUT" }, + { 409, "CONFLICT" }, + { 410, "GONE" }, + { 411, "LENGTH REQUIRED" }, + { 412, "PRECONDITION FAILED" }, + { 413, "PAYLOAD TOO LARGE" }, + { 414, "URI TOO LONG" }, + { 415, "UNSUPPORTED MEDIA TYPE" }, + { 416, "RANGE NOT SATISFIABLE" }, + { 417, "EXPECTATION FAILED" }, + { 418, "I'M A TEAPOT" }, + { 421, "MISDIRECTED REQUEST" }, + { 422, "UNPROCESSABLE ENTITY" }, + { 423, "LOCKED" }, + { 424, "FAILED DEPENDENCY" }, + { 426, "UPGRADE REQUIRED" }, + { 428, "PRECONDITION REQUIRED" }, + { 429, "TOO MANY REQUESTS" }, + { 431, "REQUEST HEADER FIELDS TOO LARGE" }, + { 451, "UNAVAILABLE FOR LEGAL REASONS" }, + { 500, "INTERNAL SERVER ERROR" }, + { 501, "NOT IMPLEMENTED" }, + { 502, "BAD GATEWAY" }, + { 503, "SERVICE UNAVAILABLE" }, + { 504, "GATEWAY TIMEOUT" }, + { 505, "HTTP VERSION NOT SUPPORTED" }, + { 506, "VARIANT ALSO NEGOTIATES" }, + { 507, "INSUFFICIENT STORAGE" }, + { 508, "LOOP DETECTED" }, + { 510, "NOT EXTENDED" }, + { 511, "NETWORK AUTHENTICATION REQUIRED" }, + { 420, "ENHANCE YOUR CALM" } +}; + +class name_value { +private: + string _name; + string _value; + +protected: + name_value() {} + +public: + name_value(string name, string value) + : _name(std::move(name)) + , _value(std::move(value)) + { + } + virtual ~name_value() = default; + name_value(const name_value&) = default; + name_value& operator=(name_value const&) = default; + name_value(name_value&&) = default; + name_value& operator=(name_value&&) = default; + + string name() { return _name; } + string value() { return _value; } + + virtual string to_string() { return ""; } +}; + +class http_header : public name_value { +public: + http_header() + : name_value() + { + } + http_header(string name, string value) + : name_value(name, value) + { + } + + string to_string() override { return name() + ": " + value() + "\r\n"; } +}; + +class query_param : public name_value { +public: + query_param() + : name_value() + { + } + query_param(string name, string value) + : name_value(name, value) + { + } + + string to_string() override { return name() + "=" + value(); } +}; + +enum http_version { HTTP_0_9, + HTTP_1_0, + HTTP_1_1, + HTTP_2_0, + HTTP_3_0 }; + +static std::unordered_map const http_version_map = { + { "HTTP/0.9", HTTP_0_9 }, + { "HTTP/1.0", HTTP_1_0 }, + { "HTTP/1.1", HTTP_1_1 }, + { "HTTP/2.0", HTTP_2_0 }, + { "HTTP/3.0", HTTP_3_0 } +}; + +static std::unordered_map const http_reverse_version_map = { + { HTTP_0_9, "HTTP/0.9" }, + { HTTP_1_0, "HTTP/1.0" }, + { HTTP_1_1, "HTTP/1.1" }, + { HTTP_2_0, "HTTP/2.0" }, + { HTTP_3_0, "HTTP/3.0" } +}; + +class http_request { +private: + enum parser_state { METHOD, + PATH, + QUERY_PARAM_NAME, + QUERY_PARAM_VALUE, + VERSION, + HEADER_NAME, + HEADER_VALUE, + BODY_CONTENT }; + http_method _method; + http_version _http_version; + string _path; + string _client_ipaddr; + string _body_content; + unordered_map _headers; // kinda goofy, whatever + unordered_map _query_params; // kinda goofy, whatever + +public: + http_request(anthracite_socket& s) + : _path("") + { + string raw_data = s.recv_message(HTTP_HEADER_BYTES); + _client_ipaddr = s.get_client_ip(); + + parser_state state = METHOD; + + string scratch = ""; + string scratch_2 = ""; + for (int i = 0; i < raw_data.length(); i++) { + switch (state) { + case METHOD: { + if (raw_data[i] == ' ') { + if (http_method_map.find(scratch) == http_method_map.end()) { + _method = http_method::UNKNOWN; + } else { + _method = http_method_map.find(scratch)->second; + } + scratch = ""; + state = PATH; + } else { + scratch += raw_data[i]; + } + } break; + + case PATH: { + switch (raw_data[i]) { + case ' ': + state = VERSION; + break; + case '?': + state = QUERY_PARAM_NAME; + break; + default: + _path += raw_data[i]; + break; + } + } break; + + case QUERY_PARAM_NAME: { + if (raw_data[i] == ' ') { + scratch = ""; + state = VERSION; + } else if (raw_data[i] == '=') { + state = QUERY_PARAM_VALUE; + } else { + scratch += raw_data[i]; + } + } break; + + case QUERY_PARAM_VALUE: { + if (raw_data[i] == ' ') { + _query_params[scratch] = query_param(scratch, scratch_2); + scratch = ""; + scratch_2 = ""; + state = VERSION; + } else if (raw_data[i] == '&') { + _query_params[scratch] = query_param(scratch, scratch_2); + scratch = ""; + scratch_2 = ""; + state = QUERY_PARAM_NAME; + } else { + scratch_2 += raw_data[i]; + } + } break; + + case VERSION: { + if (raw_data[i] == '\n') { + _http_version = http_version_map.find(scratch)->second; + scratch = ""; + state = HEADER_NAME; + } else if (raw_data[i] != '\r') { + scratch += raw_data[i]; + } + } break; + + case HEADER_NAME: { + if (raw_data[i] == '\n') { + scratch = ""; + scratch_2 = ""; + state = BODY_CONTENT; + break; + } else if (raw_data[i] == ' ') { + scratch = ""; + cout << "Error: Whitespace found in header name\n"; + break; + } else if (raw_data[i] == ':') { + state = HEADER_VALUE; + i++; + } else { + scratch += raw_data[i]; + } + } break; + + case HEADER_VALUE: { + if (raw_data[i] == '\n') { + _headers[scratch] = http_header(scratch, scratch_2); + scratch = ""; + scratch_2 = ""; + state = HEADER_NAME; + } else if (raw_data[i] != '\r') { + scratch_2 += raw_data[i]; + } + } break; + + case BODY_CONTENT: { + _body_content += raw_data[i]; + } break; + } + } + } + + string path() { return _path; } + + http_method method() { return _method; } + + string client_ip() { return _client_ipaddr; } + + string to_string() + { + string response = ""; + response += http_reverse_method_map.find(_method)->second + " " + _path + "?"; + + for (auto qp : _query_params) { + response += qp.second.to_string() + "&"; + } + + response += " " + http_reverse_version_map.find(_http_version)->second + "\r\n"; + + for (auto header : _headers) { + response += header.second.to_string(); + } + + response += "\r\n"; + response += _body_content; + + return response; + } +}; + +class http_response { +private: + int _status_code; + string _content; + unordered_map _headers; // kinda goofy, whatever + +public: + http_response(string content, int status_code = 200) + : _content(std::move(content)) + , _status_code(status_code) + { + } + + int status_code() { return _status_code; } + + void add_header(http_header header, bool override_existing = true) + { + if (override_existing || _headers.find(header.name()) == _headers.end()) { + _headers[header.name()] = header; + } + } + + string to_string() + { + string response = ""; + response += "HTTP/1.1 " + ::to_string(_status_code) + " " + http_status_map.find(_status_code)->second + "\r\n"; + + add_header(http_header("Content-Type", "text/html"), false); + add_header(http_header("Content-Length", ::to_string(_content.length())), false); + add_header(http_header("Server", "Anthracite/0.0.1"), false); + + for (auto header : _headers) { + response += header.second.to_string(); + } + + response += "\r\n"; + response += _content; + + return response; + } +}; diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..db02ff9 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,69 @@ +#include "backends/file_backend.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace std; + +void log_request_and_response(http_request& req, unique_ptr& resp); + +constexpr int default_port = 80; + +int active_threads = 0; +mutex mtx; +condition_variable cv; + +void handle_client(anthracite_socket s, file_backend& fb) +{ + http_request req(s); + unique_ptr resp = fb.handle_request(req); + log_request_and_response(req, resp); + s.send_message(resp->to_string()); + resp.reset(); + s.close_conn(); + + { + std::lock_guard lock(mtx); + active_threads--; + } + + cv.notify_one(); +} + +int main(int argc, char** argv) +{ + int port_number = default_port; + + if (argc > 1) { + port_number = atoi(argv[1]); + } + + cout << "Initializing Anthracite" << endl; + anthracite_socket s(port_number); + file_backend fb(true); + cout << "Initialization Complete" << endl; + cout << "Listening for HTTP connections on port " << port_number << endl; + + for (;;) { + s.wait_for_conn(); + std::unique_lock lock(mtx); + cv.wait(lock, [] { return active_threads < 20; }); + active_threads++; + thread(handle_client, s, ref(fb)).detach(); + } + + exit(0); +} + +void log_request_and_response(http_request& req, unique_ptr& resp) +{ + cout << "[" << resp->status_code() << " " + http_status_map.find(resp->status_code())->second + "] " + req.client_ip() + " " + http_reverse_method_map.find(req.method())->second + " " + req.path() << endl; +} diff --git a/src/socket.cpp b/src/socket.cpp new file mode 100644 index 0000000..ae840be --- /dev/null +++ b/src/socket.cpp @@ -0,0 +1,78 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace std; + +class anthracite_socket { +private: + int server_socket; + int client_socket {}; + string client_ip; + struct sockaddr_in client_addr {}; + socklen_t client_addr_len {}; + +public: + anthracite_socket(int port, int max_queue = 10) + : server_socket(socket(AF_INET, SOCK_STREAM, 0)) + , client_ip("") + { + struct sockaddr_in address {}; + address.sin_family = AF_INET; + address.sin_port = htons(port); + address.sin_addr.s_addr = INADDR_ANY; + + int x = 1; + setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x)); + bind(server_socket, (struct sockaddr*)&address, sizeof(address)); + + ::listen(server_socket, max_queue); + } + + void wait_for_conn() + { + client_ip = ""; + client_socket = accept(server_socket, (struct sockaddr*)&client_addr, &client_addr_len); + char ip_str[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &client_addr.sin_addr, ip_str, INET_ADDRSTRLEN); + client_ip = string(ip_str); + } + + string get_client_ip() + { + return client_ip; + } + + void close_conn() + { + close(client_socket); + client_socket = -1; + } + + void send_message(string msg) + { + if (client_socket == -1) { + return; + } + send(client_socket, &msg[0], msg.length(), 0); + } + + string recv_message(int buffer_size = 1024) + { + if (client_socket == -1) { + return ""; + } + + char response[buffer_size + 1]; + recv(client_socket, response, sizeof(response), 0); + response[buffer_size] = '\0'; + return string(response); + } +}; diff --git a/default_www/regular/index.html b/src/www/index.html similarity index 66% rename from default_www/regular/index.html rename to src/www/index.html index 5fe9382..fae6298 100644 --- a/default_www/regular/index.html +++ b/src/www/index.html @@ -1,7 +1,3 @@ - - Anthracite - -

Anthracite is Running!

If you are seeing this page, then Anthracite is configured correctly!

diff --git a/src/www/large.html b/src/www/large.html new file mode 100644 index 0000000..cb6730d --- /dev/null +++ b/src/www/large.html @@ -0,0 +1,1020251 @@ + + diff --git a/src/www/test.html b/src/www/test.html new file mode 100644 index 0000000..b269607 --- /dev/null +++ b/src/www/test.html @@ -0,0 +1,3 @@ +
+

Test Page!

+
diff --git a/tests/speed_tests.cpp b/tests/speed_tests.cpp deleted file mode 100644 index e9da069..0000000 --- a/tests/speed_tests.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "../lib/http/request.hpp" -#include -#include -#include - -#ifdef SPEEDTEST_COMPARE_BOOST -#include -#endif - -using std::chrono::duration; -using std::chrono::duration_cast; -using std::chrono::high_resolution_clock; -using std::chrono::milliseconds; - -constexpr uint32_t num_requests = 10000000; - -TEST(speed_tests, request_parse) -{ - std::ifstream t("./test_files/test_request.http"); - std::stringstream buffer; - buffer << t.rdbuf(); - std::string raw_req = buffer.str(); - - auto start = high_resolution_clock::now(); - - for (int i = 0; i < num_requests; ++i) { - volatile anthracite::http::request req(raw_req, "0.0.0.0"); - } - - auto end = high_resolution_clock::now(); - - auto ms_int = duration_cast(end - start); - - double m_rps = ((1000.0 / ms_int.count()) * num_requests) / 1000000; - - std::cout << "Parsed " << (num_requests / 1000000) << " Million requests in " << ms_int << " ms"; - std::cout << " at " << m_rps << " Million RPS " << std::endl; - - ASSERT_LT(ms_int.count(), 2000); -} - -#ifdef SPEEDTEST_COMPARE_BOOST -TEST(speed_tests, boost) -{ - std::ifstream t("./test_files/test_request.http"); - std::stringstream buffer; - buffer << t.rdbuf(); - std::string raw_req = buffer.str(); - - auto start = high_resolution_clock::now(); - - for (int i = 0; i < num_requests; ++i) { - boost::system::error_code ec; - boost::beast::http::request_parser p; - p.put(boost::asio::buffer(raw_req), ec); - boost::beast::http::request r = p.get(); - } - - auto end = high_resolution_clock::now(); - auto ms_int = duration_cast(end - start); - - double m_rps = ((1000.0 / ms_int.count()) * num_requests) / 1000000; - - std::cout << "Parsed " << (num_requests / 1000000) << " Million requests in " << ms_int << " ms"; - std::cout << " at " << m_rps << " Million RPS " << std::endl; -} -#endif diff --git a/tests/test_files/test_request.http b/tests/test_files/test_request.http deleted file mode 100644 index b7c6957..0000000 --- a/tests/test_files/test_request.http +++ /dev/null @@ -1,15 +0,0 @@ -GET /foo/bar?test=a&test2=b HTTP/1.1 -Accept: */* -Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 -Accept-Encoding: gzip,deflate -Accept-Language: fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3 -Connection: keep-alive -Content-Type: application/x-www-form-urlencoded -Cookie: foo=bar; lorem=ipsum; -Host: example.org -Keep-Alive: 115 -Referer: http://example.org/test -User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; fr; rv:1.9.2.8) Gecko/20100722 Firefox/3.6.8 -X-Requested-With: XMLHttpRequest - -{ "test": "content" } diff --git a/tests/unit_tests.cpp b/tests/unit_tests.cpp deleted file mode 100644 index e152679..0000000 --- a/tests/unit_tests.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "../lib/http/request.hpp" -#include -#include -#include - -TEST(unit_tests, single_request_parse) -{ - std::ifstream t("./test_files/test_request.http"); - std::stringstream buffer; - buffer << t.rdbuf(); - - std::string raw_req = buffer.str(); - std::string expected = buffer.str(); - - anthracite::http::request req(raw_req, "0.0.0.0"); - - ASSERT_EQ(expected, req.to_string()); -}