소스 검색

Move to unprivileged user

Bob Mottram 8 년 전
부모
커밋
3213eb004c
2개의 변경된 파일59개의 추가작업 그리고 56개의 파일을 삭제
  1. 58
    55
      src/freedombone-app-turtl
  2. 1
    1
      src/freedombone-utils-validation

+ 58
- 55
src/freedombone-app-turtl 파일 보기

@@ -47,6 +47,7 @@ TURTL_REPO="https://github.com/turtl/js.git"
47 47
 TURTL_COMMIT='61923ffb47d95d172f80d14c76aa032a4d5f5d6d'
48 48
 TURTL_ADMIN_PASSWORD=
49 49
 TURTL_STORAGE_LIMIT_MB=100
50
+TURTL_BASE_DIR=/etc/turtl
50 51
 
51 52
 LIBUV_VERSION='1.9.1'
52 53
 LIBUV_HASH='e83953782c916d7822ef0b94e8115ce5756fab5300cca173f0de5f5b0e0ae928'
@@ -252,7 +253,7 @@ function remove_turtl_old {
252 253
 }
253 254
 
254 255
 function remove_turtl {
255
-    if [ ! -d /opt/api ]; then
256
+    if [ ! -d $TURTL_BASE_DIR ]; then
256 257
         return
257 258
     fi
258 259
     systemctl stop turtl
@@ -262,13 +263,10 @@ function remove_turtl {
262 263
     remove_app turtl
263 264
     remove_completion_param install_turtl
264 265
     sed -i '/turtl/d' $COMPLETION_FILE
265
-    rm $INSTALL_DIR/quicklisp.lisp
266
-    rm $INSTALL_DIR/asdf.lisp
266
+    deluser turtl
267 267
     rm -rf /etc/rethinkdb
268 268
     rm -rf /var/lib/rethinkdb
269
-    rm -rf /root/quicklisp
270
-    rm -rf /opt/ccl
271
-    rm -rf /opt/api
269
+    rm -rf $TURTL_BASE_DIR
272 270
 }
273 271
 
274 272
 function install_libuv {
@@ -484,9 +482,9 @@ function install_turtl_old {
484 482
 
485 483
     check_architecture=$(uname -a)
486 484
     if [[ "$check_architecture" == *"64"* && "$check_architecture" != *"arm"* ]]; then
487
-        su -c '/usr/bin/ccl64 --load install.lisp --eval "(quit)"' - turtl
485
+        su -c '/usr/bin/ccl64 --load install.lisp --eval "(ccl::quit)"' - turtl
488 486
     else
489
-        su -c '/usr/bin/ccl --load install.lisp --eval "(quit)"' - turtl
487
+        su -c '/usr/bin/ccl --load install.lisp --eval "(ccl::quit)"' - turtl
490 488
     fi
491 489
 
492 490
     echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" > /var/www/$TURTL_DOMAIN_NAME/htdocs/api/launch.lisp
@@ -712,14 +710,14 @@ function turtl_setup {
712 710
     DEFAULT_STORAGE_LIMIT=${DEFAULT_STORAGE_LIMIT:-100}
713 711
     STORAGE_INVITE_CREDIT=${STORAGE_INVITE_CREDIT:-25}
714 712
     LOCAL_UPLOAD_URL=${LOCAL_UPLOAD_URL:-http://turtl.local}
715
-    LOCAL_UPLOAD_PATH=${LOCAL_UPLOAD_PATH:-"/opt/api/uploads"}
713
+    LOCAL_UPLOAD_PATH=${LOCAL_UPLOAD_PATH:-"$TURTL_BASE_DIR/api/uploads"}
716 714
     AWS_S3_TOKEN=${AWS_S3_TOKEN:-(:token ''
717 715
                                   :secret ''
718 716
                                   :bucket ''
719 717
                                   :endpoint 'https://s3.amazonaws.com')}
720 718
 
721 719
     # generates the config-file
722
-    cat  << __ENDCONFIG__ > /opt/api/config/config.lisp
720
+    cat  << __ENDCONFIG__ > $TURTL_BASE_DIR/api/config/config.lisp
723 721
 (in-package :turtl)
724 722
 (defparameter *root* (asdf:system-relative-pathname :turtl #P""))
725 723
 (defparameter *pid-file* "${PIDFILE}")
@@ -745,7 +743,7 @@ function turtl_setup {
745 743
 (defvar *amazon-s3* "${AWS_S3_TOKEN}")
746 744
 __ENDCONFIG__
747 745
 
748
-    cat /opt/api/config/config.footer >> /opt/api/config/config.lisp
746
+    cat $TURTL_BASE_DIR/api/config/config.footer >> $TURTL_BASE_DIR/api/config/config.lisp
749 747
 
750 748
     # start the turtl server
751 749
     systemctl restart rethinkdb
@@ -760,16 +758,16 @@ __ENDCONFIG__
760 758
     echo '' >> /etc/systemd/system/turtl.service
761 759
     echo '[Service]' >> /etc/systemd/system/turtl.service
762 760
     echo 'Type=simple' >> /etc/systemd/system/turtl.service
763
-    echo 'User=root' >> /etc/systemd/system/turtl.service
764
-    echo 'WorkingDirectory=/opt/api/' >> /etc/systemd/system/turtl.service
761
+    echo 'User=turtl' >> /etc/systemd/system/turtl.service
762
+    echo "WorkingDirectory=$TURTL_BASE_DIR/api/" >> /etc/systemd/system/turtl.service
765 763
 
766 764
     if [[ "$check_architecture" == *"64"* && "$check_architecture" != *"arm"* ]]; then
767
-        echo "ExecStart=/opt/ccl/lx86cl64 -l /root/quicklisp/setup.lisp -l launch.lisp" >> /etc/systemd/system/turtl.service
765
+        echo "ExecStart=$TURTL_BASE_DIR/ccl/lx86cl64 -l $TURTL_BASE_DIR/quicklisp/setup.lisp -l launch.lisp" >> /etc/systemd/system/turtl.service
768 766
     else
769 767
         if [[ "$check_architecture" != *"arm"* ]]; then
770
-            echo "ExecStart=/opt/ccl/lx86cl -l /root/quicklisp/setup.lisp -l launch.lisp" >> /etc/systemd/system/turtl.service
768
+            echo "ExecStart=$TURTL_BASE_DIR/ccl/lx86cl -l $TURTL_BASE_DIR/quicklisp/setup.lisp -l launch.lisp" >> /etc/systemd/system/turtl.service
771 769
         else
772
-            echo "ExecStart=/opt/ccl/larmcl -l /root/quicklisp/setup.lisp -l launch.lisp" >> /etc/systemd/system/turtl.service
770
+            echo "ExecStart=$TURTL_BASE_DIR/ccl/larmcl -l $TURTL_BASE_DIR/quicklisp/setup.lisp -l launch.lisp" >> /etc/systemd/system/turtl.service
773 771
         fi
774 772
     fi
775 773
     echo '' >> /etc/systemd/system/turtl.service
@@ -777,6 +775,7 @@ __ENDCONFIG__
777 775
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/turtl.service
778 776
     chmod +x /etc/systemd/system/turtl.service
779 777
 
778
+    chown -R turtl:turtl $TURTL_BASE_DIR
780 779
     systemctl enable turtl
781 780
     systemctl daemon-reload
782 781
     systemctl start turtl
@@ -786,25 +785,25 @@ function install_turtl_api {
786 785
     # https://github.com/ArthurGarnier/turtl-docker
787 786
     apt-get -yq install wget libterm-readline-perl-perl gcc libuv1-dev
788 787
 
789
-    if [ ! -d $INSTALL_DIR ]; then
790
-        mkdir -p $INSTALL_DIR
788
+    if [ ! -d $TURTL_BASE_DIR ]; then
789
+        mkdir -p $TURTL_BASE_DIR
791 790
     fi
792
-    cd $INSTALL_DIR
791
+    cd $TURTL_BASE_DIR
793 792
     check_architecture=$(uname -a)
794 793
 
795 794
     # Install ccl
796 795
     if [[ "$check_architecture" != *"arm"* ]]; then
797
-        wget -P /opt/ ftp://ftp.clozure.com/pub/release/1.11/ccl-1.11-linuxx86.tar.gz
798
-        mkdir -p /opt/ccl
799
-        tar xvzf /opt/ccl-1.11-linuxx86.tar.gz -C /opt/ccl --strip-components=1
796
+        wget -P $TURTL_BASE_DIR/ ftp://ftp.clozure.com/pub/release/1.11/ccl-1.11-linuxx86.tar.gz
797
+        mkdir -p $TURTL_BASE_DIR/ccl
798
+        tar xvzf $TURTL_BASE_DIR/ccl-1.11-linuxx86.tar.gz -C $TURTL_BASE_DIR/ccl --strip-components=1
800 799
     else
801
-        wget -P /opt/ ftp://ftp.clozure.com/pub/release/1.11/ccl-1.11-linuxarm.tar.gz
802
-        mkdir -p /opt/ccl
803
-        tar xvzf /opt/ccl-1.11-linuxarm.tar.gz -C /opt/ccl --strip-components=1
800
+        wget -P $TURTL_BASE_DIR/ ftp://ftp.clozure.com/pub/release/1.11/ccl-1.11-linuxarm.tar.gz
801
+        mkdir -p $TURTL_BASE_DIR/ccl
802
+        tar xvzf $TURTL_BASE_DIR/ccl-1.11-linuxarm.tar.gz -C $TURTL_BASE_DIR/ccl --strip-components=1
804 803
     fi
805 804
 
806 805
     # install quicklisp
807
-    cat  << __ENDCONFIG__ > $INSTALL_DIR/quicklisp_install
806
+    cat  << __ENDCONFIG__ > $TURTL_BASE_DIR/quicklisp_install
808 807
 (load (compile-file "asdf.lisp"))
809 808
 (load (compile-file "quicklisp.lisp"))
810 809
 (quicklisp-quickstart:install)
@@ -875,56 +874,60 @@ __ENDCONFIG__
875 874
     if [ ! -f quicklisp.lisp ]; then
876 875
         wget https://beta.quicklisp.org/quicklisp.lisp
877 876
     fi
877
+
878
+    adduser --disabled-login --home=$TURTL_BASE_DIR --gecos 'turtl' turtl
879
+    chown -R turtl:turtl $TURTL_BASE_DIR
880
+
878 881
     if [[ "$check_architecture" != *"arm"* ]]; then
879 882
         if [[ "$check_architecture" == *"64"* ]]; then
880
-            cat $INSTALL_DIR/quicklisp_install | /opt/ccl/lx86cl64
883
+            su -c "cat $TURTL_BASE_DIR/quicklisp_install | $TURTL_BASE_DIR/ccl/lx86cl64" - turtl
881 884
         else
882
-            cat $INSTALL_DIR/quicklisp_install | /opt/ccl/lx86cl
885
+            su -c "cat $TURTL_BASE_DIR/quicklisp_install | $TURTL_BASE_DIR/ccl/lx86cl" - turtl
883 886
         fi
884 887
     else
885
-        cat $INSTALL_DIR/quicklisp_install | /opt/ccl/larmcl
888
+        su -c "cat $TURTL_BASE_DIR/quicklisp_install | $TURTL_BASE_DIR/ccl/larmcl" - turtl
886 889
     fi
887
-    rm $INSTALL_DIR/quicklisp_install
890
+    rm $TURTL_BASE_DIR/quicklisp_install
888 891
 
889 892
     install_rethinkdb
890 893
 
891 894
     # install turtl API
892
-    cd /opt/
893
-    git clone $TURTL_API_REPO /opt/api
894
-    cd /opt/api
895
+    cd $TURTL_BASE_DIR/
896
+    git clone $TURTL_API_REPO $TURTL_BASE_DIR/api
897
+    cd $TURTL_BASE_DIR/api
895 898
     git checkout $TURTL_API_COMMIT -b $TURTL_API_COMMIT
896 899
     cd /root/quicklisp/local-projects
897 900
     git clone git://github.com/orthecreedence/cl-hash-util
898 901
     if [[ "$check_architecture" != *"arm"* ]]; then
899 902
         if [[ "$check_architecture" == *"64"* ]]; then
900
-            /opt/ccl/lx86cl64 -l /root/quicklisp/setup.lisp
903
+            su -c "cat '(ccl:quit)' | $TURTL_BASE_DIR/ccl/lx86cl64 -l /root/quicklisp/setup.lisp" - turtl
901 904
         else
902
-            /opt/ccl/lx86cl -l /root/quicklisp/setup.lisp
905
+            su -c "cat '(ccl:quit)' | $TURTL_BASE_DIR/ccl/lx86cl -l /root/quicklisp/setup.lisp" - turtl
903 906
         fi
904 907
     else
905
-        /opt/ccl/larmcl -l /root/quicklisp/setup.lisp
908
+        su -c "cat '(ccl:quit)' | $TURTL_BASE_DIR/ccl/larmcl -l /root/quicklisp/setup.lisp" - turtl
906 909
     fi
907 910
 
908 911
     # config
909
-    echo '(defvar *enabled-cors-resources* "resource://turtl-at-lyonbros-dot-com"' > /opt/api/config/config.footer
910
-    echo '  "When set, will enable CORS for resource:// origins if they match the given' >> /opt/api/config/config.footer
911
-    echo '   string. Entries should be comma separated (this string is passed verbatim in' >> /opt/api/config/config.footer
912
-    echo '   the Access-Control-Allow-Origin header).")' >> /opt/api/config/config.footer
913
-    echo '(defparameter *public-actions*' >> /opt/api/config/config.footer
914
-    echo "  \`((:post . ,(concatenate 'string *api-path* \"/users\"))" >> /opt/api/config/config.footer
915
-    echo "    (:post . ,(concatenate 'string *api-path* \"/log/error\"))" >> /opt/api/config/config.footer
916
-    echo '    (:post . "/cla/sign")' >> /opt/api/config/config.footer
917
-    echo '    (:get  . "/ping")' >> /opt/api/config/config.footer
918
-    echo '    (:get  . "/admin")' >> /opt/api/config/config.footer
919
-    echo "    (:get . ,(cl-ppcre:create-scanner (concatenate 'string *api-path* \"/invites/codes/([0-9a-f-]+)\"))))" >> /opt/api/config/config.footer
920
-    echo "  \"A list of public resources/actions that do not require authentication.\")" >> /opt/api/config/config.footer
921
-    echo "(defvar *analytics* '(:enabled t" >> /opt/api/config/config.footer
922
-    echo '                      :db "analytics"))' >> /opt/api/config/config.footer
923
-
924
-    cp $INSTALL_DIR/asdf.lisp /opt/api
925
-    echo '(load (compile-file "asdf.lisp"))' > /opt/api/launch.lisp
926
-    echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" >> /opt/api/launch.lisp
927
-    echo '(load "start")' >> /opt/api/launch.lisp
912
+    echo '(defvar *enabled-cors-resources* "resource://turtl-at-lyonbros-dot-com"' > $TURTL_BASE_DIR/api/config/config.footer
913
+    echo '  "When set, will enable CORS for resource:// origins if they match the given' >> $TURTL_BASE_DIR/api/config/config.footer
914
+    echo '   string. Entries should be comma separated (this string is passed verbatim in' >> $TURTL_BASE_DIR/api/config/config.footer
915
+    echo '   the Access-Control-Allow-Origin header).")' >> $TURTL_BASE_DIR/api/config/config.footer
916
+    echo '(defparameter *public-actions*' >> $TURTL_BASE_DIR/api/config/config.footer
917
+    echo "  \`((:post . ,(concatenate 'string *api-path* \"/users\"))" >> $TURTL_BASE_DIR/api/config/config.footer
918
+    echo "    (:post . ,(concatenate 'string *api-path* \"/log/error\"))" >> $TURTL_BASE_DIR/api/config/config.footer
919
+    echo '    (:post . "/cla/sign")' >> $TURTL_BASE_DIR/api/config/config.footer
920
+    echo '    (:get  . "/ping")' >> $TURTL_BASE_DIR/api/config/config.footer
921
+    echo '    (:get  . "/admin")' >> $TURTL_BASE_DIR/api/config/config.footer
922
+    echo "    (:get . ,(cl-ppcre:create-scanner (concatenate 'string *api-path* \"/invites/codes/([0-9a-f-]+)\"))))" >> $TURTL_BASE_DIR/api/config/config.footer
923
+    echo "  \"A list of public resources/actions that do not require authentication.\")" >> $TURTL_BASE_DIR/api/config/config.footer
924
+    echo "(defvar *analytics* '(:enabled t" >> $TURTL_BASE_DIR/api/config/config.footer
925
+    echo '                      :db "analytics"))' >> $TURTL_BASE_DIR/api/config/config.footer
926
+
927
+    cp $TURTL_BASE_DIR/asdf.lisp $TURTL_BASE_DIR/api
928
+    echo '(load (compile-file "asdf.lisp"))' > $TURTL_BASE_DIR/api/launch.lisp
929
+    echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" >> $TURTL_BASE_DIR/api/launch.lisp
930
+    echo '(load "start")' >> $TURTL_BASE_DIR/api/launch.lisp
928 931
 
929 932
     turtl_setup
930 933
 }

+ 1
- 1
src/freedombone-utils-validation 파일 보기

@@ -62,7 +62,7 @@ function validate_freedns_code {
62 62
 
63 63
 function is_valid_user {
64 64
     USRNAME="$1"
65
-    if [[ "$USRNAME" != "znc" && "$USRNAME" != "pihole" && "$USRNAME" != "fbone" && "$USRNAME" != "go" && "$USRNAME" != "gogs" && "$USRNAME" != "git" && "$USRNAME" != "mirrors" && "$USRNAME" != "sync" && "$USERNAME" != "tahoelafs" ]]; then
65
+    if [[ "$USRNAME" != "turtl" && "$USRNAME" != "znc" && "$USRNAME" != "pihole" && "$USRNAME" != "fbone" && "$USRNAME" != "go" && "$USRNAME" != "gogs" && "$USRNAME" != "git" && "$USRNAME" != "mirrors" && "$USRNAME" != "sync" && "$USERNAME" != "tahoelafs" ]]; then
66 66
         echo "1"
67 67
     else
68 68
         echo "0"