diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..d0329688 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,13 @@ +** + +!/source +!/types +!/utils +!/plugin +!/notifiers +!/handlers +!/core +!/cmd +!/Makefile +!/README.md +!/LICENSE \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 2a6f4667..e956f22c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ language: go go: - "1.10.x" +go_import_path: github.com/hunterlong/statup + install: true sudo: required @@ -18,12 +20,12 @@ services: env: global: - - VERSION=0.36 - - DB_HOST=localhost - - DB_USER=travis - - DB_PASS= - - DB_DATABASE=test - - GO_ENV=test + - DB_HOST=localhost + - DB_USER=travis + - DB_PASS= + - DB_DATABASE=test + - GO_ENV=test + - STATUP_DIR=$GOPATH/src/github.com/hunterlong/statup matrix: allow_failures: @@ -33,19 +35,19 @@ matrix: before_deploy: - git config --local user.name "hunterlong" - git config --local user.email "info@socialeck.com" - - git tag "v$VERSION" --force + - make tag deploy: - provider: releases api_key: $GH_TOKEN file: - - "cmd/build/statup-osx-x64.tar.gz" - - "cmd/build/statup-osx-x32.tar.gz" - - "cmd/build/statup-linux-x64.tar.gz" - - "cmd/build/statup-linux-x32.tar.gz" - - "cmd/build/statup-linux-arm64.tar.gz" - - "cmd/build/statup-linux-arm7.tar.gz" - - "cmd/build/statup-linux-alpine.tar.gz" - - "cmd/build/statup-windows-x64.zip" + - "build/statup-osx-x64.tar.gz" + - "build/statup-osx-x32.tar.gz" + - "build/statup-linux-x64.tar.gz" + - "build/statup-linux-x32.tar.gz" + - "build/statup-linux-arm64.tar.gz" + - "build/statup-linux-arm7.tar.gz" + - "build/statup-linux-alpine.tar.gz" + - "build/statup-windows-x64.zip" skip_cleanup: true notifications: @@ -54,24 +56,17 @@ notifications: before_script: - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' - psql -c 'create database test;' -U postgres - - go get github.com/stretchr/testify/assert - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls - - go install github.com/mattn/goveralls - - go get github.com/rendon/testcli - - go get github.com/karalabe/xgo - - go get github.com/GeertJohan/go.rice - - go get github.com/GeertJohan/go.rice/rice - - cd cmd && go get && cd $GOPATH/src/github.com/hunterlong/statup + - gem install sass + - make deps + - make install script: - - /bin/bash -c .travis/compile.sh - - go test -v ./... -p 1 -ldflags="-X main.VERSION=$VERSION" -covermode=count -coverprofile=coverage.out - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis -repotoken $COVERALLS; fi + - make test + - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make coverage; fi after_success: - if [[ "$TRAVIS_BRANCH" == "master" ]]; then travis_wait 30 docker pull karalabe/xgo-latest; fi - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then /bin/bash -c .travis/build.sh; fi + - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make release; fi after_deploy: - - /bin/bash -c .travis/deploy.sh + - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make publish-dev; fi diff --git a/.travis/Dockerfile b/.travis/Dockerfile new file mode 100644 index 00000000..447ed1e9 --- /dev/null +++ b/.travis/Dockerfile @@ -0,0 +1,28 @@ +FROM golang:1.10.3-alpine +LABEL MAINTAINER = 'Hunter Long (https://github.com/hunterlong)' + +# Statup 'test' image for running a full test using the production environment + +RUN apk add --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers + +RUN wget -q https://assets.statup.io/sass && \ + chmod +x sass && \ + mv sass /usr/local/bin/sass +RUN sass -v + +WORKDIR $GOPATH/src/github.com/hunterlong/statup + +COPY . . +RUN make deps +RUN make compile +RUN make install + +ENV VERSION=$(VERSION) +ENV IS_DOCKER=true +ENV SASS=/usr/local/bin/sass +ENV ONLY_DB=sqlite +ENV STATUP_DIR=/go/src/github.com/hunterlong/statup +ENV GO_ENV=test + +EXPOSE 8080 +ENTRYPOINT SASS=$(SASS) VERSION=$(VERSION) make test \ No newline at end of file diff --git a/.travis/Dockerfile.dev b/.travis/Dockerfile.dev deleted file mode 100644 index de8a5191..00000000 --- a/.travis/Dockerfile.dev +++ /dev/null @@ -1,27 +0,0 @@ -FROM golang:1.10.3-alpine - -RUN apk update && apk add git g++ libstdc++ ca-certificates - -WORKDIR $GOPATH/src/github.com/hunterlong/statup/ - -COPY . $GOPATH/src/github.com/hunterlong/statup/ -RUN go get github.com/GeertJohan/go.rice/rice -RUN go get -d -v -RUN rice embed-go -RUN go install - -RUN wget -q https://assets.statup.io/sass && \ - chmod +x sass && \ - mv sass /usr/local/bin/sass - -ENV IS_DOCKER=true -ENV SASS=/usr/local/bin/sass -ENV CMD_FILE=/usr/bin/cmd - -RUN printf "#!/usr/bin/env sh\n\$1\n" > $CMD_FILE && \ - chmod +x $CMD_FILE - -WORKDIR /app -VOLUME /app -EXPOSE 8080 -CMD ["/go/bin/statup"] \ No newline at end of file diff --git a/.travis/compile.sh b/.travis/compile.sh index a05d4f6d..d28a4885 100755 --- a/.travis/compile.sh +++ b/.travis/compile.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -cd $GOPATH/src/github.com/hunterlong/statup/core +cd $GOPATH/src/github.com/hunterlong/statup/source # RENDERING CSS gem install sass -sass ../source/scss/base.scss ../source/css/base.css +sass scss/base.scss css/base.css # MIGRATION SQL FILE FOR CURRENT VERSION #printf "UPDATE core SET version='$VERSION';\n" >> source/sql/upgrade.sql diff --git a/Dockerfile b/Dockerfile index 77af5d5a..e13483f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:latest +LABEL MAINTAINER = 'Hunter Long (https://github.com/hunterlong)' -ENV VERSION=v0.35 +# Locked version of Statup for 'latest' Docker tag +ENV VERSION=v0.43 RUN apk --no-cache add libstdc++ ca-certificates RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \ @@ -8,16 +10,14 @@ RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/stat chmod +x statup && \ mv statup /usr/local/bin/statup +# sass Binary built for alpine linux RUN wget -q https://assets.statup.io/sass && \ chmod +x sass && \ mv sass /usr/local/bin/sass ENV IS_DOCKER=true ENV SASS=/usr/local/bin/sass -ENV CMD_FILE=/usr/bin/cmd - -RUN printf "#!/usr/bin/env sh\n\$1\n" > $CMD_FILE && \ - chmod +x $CMD_FILE +ENV STATUP_DIR=/app WORKDIR /app VOLUME /app diff --git a/LICENSE b/LICENSE index 4bb6ba0e..784a8442 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -Copyright (c) 2018 Hunter Long + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Preamble -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + Application monitoring for HTTP and TCP online services + Copyright (C) 2018 Hunter Long + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Statup Copyright (C) 2018 Hunter Long + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..cb0dfe87 --- /dev/null +++ b/Makefile @@ -0,0 +1,170 @@ +VERSION=0.43 +BINARY_NAME=statup +GOPATH:=$(GOPATH) +GOCMD=go +GOBUILD=$(GOCMD) build +GOTEST=$(GOCMD) test +GOGET=$(GOCMD) get +GOINSTALL=$(GOCMD) install +XGO=GOPATH=$(GOPATH) $(GOPATH)/bin/xgo -go 1.10.x --dest=build +BUILDVERSION=-ldflags "-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT)" +RICE=$(GOPATH)/bin/rice +PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH) +PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "$(VERSION)" } } } }' + +all: deps compile install clean + +release: deps build-all compress + +install: clean build + mv $(BINARY_NAME) $(GOPATH)/bin/$(BINARY_NAME) + $(GOPATH)/bin/$(BINARY_NAME) version + +build: compile + $(GOBUILD) $(BUILDVERSION) -o $(BINARY_NAME) -v ./cmd + +run: build + ./$(BINARY_NAME) --ip localhost --port 8080 + +compile: + cd source && $(GOPATH)/bin/rice embed-go + sass source/scss/base.scss source/css/base.css + +test: clean compile install + go test -v -p=1 $(BUILDVERSION) -coverprofile=coverage.out ./... + gocov convert coverage.out > coverage.json + +test-all: compile databases + $(GOTEST) ./... -p=1 $(BUILDVERSION) -coverprofile=coverage.out -v + +coverage: + $(GOPATH)/bin/goveralls -coverprofile=coverage.out -service=travis -repotoken $(COVERALLS) + +docs: + godoc2md github.com/hunterlong/statup > servers/docs/README.md + gocov-html coverage.json > servers/docs/COVERAGE.html + revive -formatter stylish > servers/docs/LINT.md + +build-all: clean compile + mkdir build + $(XGO) $(BUILDVERSION) --targets=darwin/amd64 ./cmd + $(XGO) $(BUILDVERSION) --targets=darwin/386 ./cmd + $(XGO) $(BUILDVERSION) --targets=linux/amd64 ./cmd + $(XGO) $(BUILDVERSION) --targets=linux/386 ./cmd + $(XGO) $(BUILDVERSION) --targets=windows-6.0/amd64 ./cmd + $(XGO) $(BUILDVERSION) --targets=linux/arm-7 ./cmd + $(XGO) $(BUILDVERSION) --targets=linux/arm64 ./cmd + $(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd + +build-alpine: clean compile + mkdir build + $(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd + +docker: + docker build -t hunterlong/statup:latest . + +docker-dev: + docker build -t hunterlong/statup:dev -f ./cmd/Dockerfile . + +docker-test: + docker build -t hunterlong/statup:test -f ./.travis/Dockerfile . + +docker-run: docker + docker run -t -p 8080:8080 hunterlong/statup:latest + +docker-run-dev: docker-dev + docker run -t -p 8080:8080 hunterlong/statup:dev + +docker-run-test: docker-test + docker run -t -p 8080:8080 hunterlong/statup:test + +databases: + docker run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres + docker run --name statup_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password123 -e MYSQL_DATABASE=root -d mysql + sleep 30 + +deps: + $(GOGET) github.com/wellington/wellington/wt + $(GOGET) github.com/stretchr/testify/assert + $(GOGET) golang.org/x/tools/cmd/cover + $(GOGET) github.com/mattn/goveralls + $(GOINSTALL) github.com/mattn/goveralls + $(GOGET) github.com/rendon/testcli + $(GOGET) github.com/karalabe/xgo + $(GOGET) github.com/GeertJohan/go.rice + $(GOGET) github.com/GeertJohan/go.rice/rice + $(GOINSTALL) github.com/GeertJohan/go.rice/rice + $(GOCMD) get github.com/davecheney/godoc2md + $(GOCMD) install github.com/davecheney/godoc2md + $(GOCMD) get github.com/axw/gocov/gocov + $(GOCMD) get -u gopkg.in/matm/v1/gocov-html + $(GOCMD) install gopkg.in/matm/v1/gocov-html + $(GOCMD) get -u github.com/mgechev/revive + $(GOGET) -d ./... + +clean: + rm -rf build + rm -f statup + rm -rf logs + rm -rf cmd/logs + rm -rf cmd/plugins + rm -rf cmd/statup.db + rm -rf cmd/config.yml + rm -rf cmd/.sass-cache + rm -rf core/logs + rm -rf core/.sass-cache + rm -rf core/config.yml + rm -f core/statup.db + rm -rf handlers/config.yml + rm -rf handlers/statup.db + rm -rf source/logs + rm -rf utils/logs + rm -rf .sass-cache + rm -f coverage.out + +tag: + git tag "v$(VERSION)" --force + +test-env: + export GO_ENV=test + export DB_HOST=localhost + export DB_USER=root + export DB_PASS=password123 + export DB_DATABASE=root + export NAME=Demo + export STATUP_DIR=$(GOPATH)/src/github.com/hunterlong/statup + +compress: + cd build && mv alpine-linux-amd64 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-linux-alpine.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + cd build && mv cmd-darwin-10.6-amd64 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-osx-x64.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + cd build && mv cmd-darwin-10.6-386 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-osx-x32.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + cd build && mv cmd-linux-amd64 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-linux-x64.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + cd build && mv cmd-linux-386 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-linux-x32.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + cd build && mv cmd-windows-6.0-amd64.exe $(BINARY_NAME).exe + cd build && zip $(BINARY_NAME)-windows-x64.zip $(BINARY_NAME).exe && rm -f $(BINARY_NAME).exe + cd build && mv cmd-linux-arm-7 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-linux-arm7.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + cd build && mv cmd-linux-arm64 $(BINARY_NAME) + cd build && tar -czvf $(BINARY_NAME)-linux-arm64.tar.gz $(BINARY_NAME) && rm -f $(BINARY_NAME) + +publish-dev: + curl -H "Content-Type: application/json" --data '{"docker_tag": "dev"}' -X POST $(DOCKER) + +publish-test: + curl -H "Content-Type: application/json" --data '{"docker_tag": "test"}' -X POST $(DOCKER) + +publish-latest: + curl -H "Content-Type: application/json" --data '{"docker_tag": "latest"}' -X POST $(DOCKER) + +publish-homebrew: + curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(PUBLISH_BODY) https://api.travis-ci.com/repo/hunterlong%2Fhomebrew-statup/requests + +publish-crypress: + curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(PUBLISH_BODY) https://api.travis-ci.com/repo/hunterlong%2Fstatup-testing/requests + +.PHONY: build build-all build-alpine \ No newline at end of file diff --git a/README.md b/README.md index 9b909ba6..83b45ca0 100644 --- a/README.md +++ b/README.md @@ -141,8 +141,7 @@ Statup accepts Push Requests! Feel free to add your own features and notifiers. [![Go Report Card](https://goreportcard.com/badge/github.com/hunterlong/statup)](https://goreportcard.com/report/github.com/hunterlong/statup) [![Build Status](https://travis-ci.org/hunterlong/statup.svg?branch=master)](https://travis-ci.org/hunterlong/statup) [![Cypress.io tests](https://img.shields.io/badge/cypress.io-tests-green.svg?style=flat-square)](https://dashboard.cypress.io/#/projects/bi8mhr/runs) -[![Docker Pulls](https://img.shields.io/docker/pulls/hunterlong/statup.svg)](https://hub.docker.com/r/hunterlong/statup/builds/) -[![Godoc](https://godoc.org/github.com/hunterlong/statup?status.svg)](https://godoc.org/github.com/hunterlong/statup) +[![Docker Pulls](https://img.shields.io/docker/pulls/hunterlong/statup.svg)](https://hub.docker.com/r/hunterlong/statup/builds/) [![Godoc](https://godoc.org/github.com/hunterlong/statup?status.svg)](https://godoc.org/github.com/hunterlong/statup)[![Coverage Status](https://coveralls.io/repos/github/hunterlong/statup/badge.svg?branch=master)](https://coveralls.io/github/hunterlong/statup?branch=master) diff --git a/cmd/Dockerfile b/cmd/Dockerfile new file mode 100644 index 00000000..b28382a6 --- /dev/null +++ b/cmd/Dockerfile @@ -0,0 +1,30 @@ +FROM alpine:latest +LABEL MAINTAINER = 'Hunter Long (https://github.com/hunterlong)' + +# Statup 'dev' image that will download the latest version of Statup from github + +RUN apk --no-cache add libstdc++ ca-certificates curl grep sed + +RUN export VERSION=$(curl --silent "https://api.github.com/repos/hunterlong/statup/releases/latest" \ + | grep '"tag_name":' \ + | sed -E 's/.*"([^"]+)".*/\1/'); \ + wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz; + +RUN tar -xvzf statup-linux-alpine.tar.gz && \ + chmod +x statup && \ + mv statup /usr/local/bin/statup + +RUN statup version + +RUN wget -q https://assets.statup.io/sass && \ + chmod +x sass && \ + mv sass /usr/local/bin/sass + +ENV IS_DOCKER=true +ENV SASS=/usr/local/bin/sass +ENV STATUP_DIR=/app + +WORKDIR /app +VOLUME /app +EXPOSE 8080 +ENTRYPOINT statup \ No newline at end of file diff --git a/cmd/cli.go b/cmd/cli.go index 70459551..c769aab6 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -1,16 +1,32 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package main import ( "encoding/json" + "errors" "fmt" "github.com/hunterlong/statup/core" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/types" "github.com/hunterlong/statup/utils" "github.com/joho/godotenv" "io/ioutil" "math/rand" "net/http" - "os" "strings" "time" "upper.io/db.v3/sqlite" @@ -21,21 +37,37 @@ const ( POINT = " " ) -func CatchCLI(args []string) { +func CatchCLI(args []string) error { + utils.InitLogs() dir := utils.Directory + source.Assets() + LoadDotEnvs() + switch args[1] { case "version": - fmt.Printf("Statup v%v\n", VERSION) + if COMMIT != "" { + fmt.Printf("Statup v%v (%v)\n", VERSION, COMMIT) + } else { + fmt.Printf("Statup v%v\n", VERSION) + } + return errors.New("end") case "assets": - core.RenderBoxes() - core.CreateAllAssets(dir) + err := source.CreateAllAssets(dir) + if err != nil { + return err + } else { + return errors.New("end") + } case "sass": - core.CompileSASS(dir) + err := source.CompileSASS(dir) + if err == nil { + return errors.New("end") + } + return err case "update": gitCurrent, err := CheckGithubUpdates() if err != nil { - fmt.Println(err) - os.Exit(2) + return nil } fmt.Printf("Statup Version: v%v\nLatest Version: %v\n", VERSION, gitCurrent.TagName) if VERSION != gitCurrent.TagName[1:] { @@ -43,45 +75,55 @@ func CatchCLI(args []string) { } else { fmt.Printf("You have the latest version of Statup!\n") } + if err == nil { + return errors.New("end") + } + return nil case "test": cmd := args[2] switch cmd { case "plugins": LoadPlugins(true) } + return errors.New("end") case "export": var err error fmt.Printf("Statup v%v Exporting Static 'index.html' page...\n", VERSION) - core.RenderBoxes() core.Configs, err = core.LoadConfig() if err != nil { utils.Log(4, "config.yml file not found") + return err } RunOnce() indexSource := core.ExportIndexHTML() err = core.SaveFile("./index.html", []byte(indexSource)) if err != nil { utils.Log(4, err) + return err } utils.Log(1, "Exported Statup index page: 'index.html'") case "help": HelpEcho() + return errors.New("end") case "run": utils.Log(1, "Running 1 time and saving to database...") RunOnce() fmt.Println("Check is complete.") + return errors.New("end") case "env": fmt.Println("Statup Environment Variables") envs, err := godotenv.Read(".env") if err != nil { utils.Log(4, "No .env file found in current directory.") + return err } for k, e := range envs { fmt.Printf("%v=%v\n", k, e) } default: - utils.Log(3, "Statup does not have the command you entered.") + return nil } + return errors.New("end") } func RunOnce() { @@ -117,16 +159,20 @@ func HelpEcho() { fmt.Println(" statup run - Check all services 1 time and then quit") fmt.Println(" statup test plugins - Test all plugins for required information") fmt.Println(" statup assets - Dump all assets used locally to be edited.") + fmt.Println(" statup sass - Compile .scss files into the css directory") fmt.Println(" statup env - Show all environment variables being used for Statup") fmt.Println(" statup export - Exports the index page as a static HTML for pushing") fmt.Println(" statup update - Attempts to update to the latest version") fmt.Println(" statup help - Shows the user basic information about Statup") + fmt.Printf("Flags:\n") + fmt.Println(" -ip 127.0.0.1 - Run HTTP server on specific IP address (default: localhost)") + fmt.Println(" -port 8080 - Run HTTP server on Port (default: 8080)") fmt.Println("Give Statup a Star at https://github.com/hunterlong/statup") } func TestPlugin(plug types.PluginActions) { defer utils.DeleteFile("./.plugin_test.db") - core.RenderBoxes() + source.Assets() info := plug.GetInfo() fmt.Printf("\n" + BRAKER + "\n") @@ -191,7 +237,7 @@ func FakeSeed(plug types.PluginActions) { if err != nil { utils.Log(3, err) } - up, _ := core.SqlBox.String("sqlite_up.sql") + up, _ := source.SqlBox.String("sqlite_up.sql") requests := strings.Split(up, ";") for _, request := range requests { _, err := core.DbSession.Exec(request) diff --git a/cmd/cli_test.go b/cmd/cli_test.go new file mode 100644 index 00000000..d80c2acf --- /dev/null +++ b/cmd/cli_test.go @@ -0,0 +1,104 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +package main + +import ( + "github.com/rendon/testcli" + "github.com/stretchr/testify/assert" + "testing" +) + +func TestConfirmVersion(t *testing.T) { + t.SkipNow() + assert.NotEmpty(t, VERSION) +} + +func TestVersionCommand(t *testing.T) { + c := testcli.Command("statup", "version") + c.Run() + assert.True(t, c.StdoutContains("Statup v"+VERSION)) +} + +func TestHelpCommand(t *testing.T) { + c := testcli.Command("statup", "help") + c.Run() + t.Log(c.Stdout()) + assert.True(t, c.StdoutContains("statup help - Shows the user basic information about Statup")) +} + +func TestExportCommand(t *testing.T) { + t.SkipNow() + c := testcli.Command("statup", "export") + c.Run() + t.Log(c.Stdout()) + assert.True(t, c.StdoutContains("Exporting Static 'index.html' page")) + assert.True(t, fileExists(dir+"/cmd/index.html")) +} + +func TestAssetsCommand(t *testing.T) { + c := testcli.Command("statup", "assets") + c.Run() + t.Log(c.Stdout()) + t.Log("Directory for Assets: ", dir) + assert.FileExists(t, dir+"/assets/robots.txt") + assert.FileExists(t, dir+"/assets/js/main.js") + assert.FileExists(t, dir+"/assets/scss/base.scss") +} + +func TestVersionCLI(t *testing.T) { + run := CatchCLI([]string{"statup", "version"}) + assert.EqualError(t, run, "end") +} + +func TestAssetsCLI(t *testing.T) { + run := CatchCLI([]string{"statup", "assets"}) + assert.EqualError(t, run, "end") + assert.FileExists(t, dir+"/assets/css/base.css") + assert.FileExists(t, dir+"/assets/scss/base.scss") +} + +func TestSassCLI(t *testing.T) { + run := CatchCLI([]string{"statup", "sass"}) + assert.EqualError(t, run, "end") + assert.FileExists(t, dir+"/assets/css/base.css") +} + +func TestUpdateCLI(t *testing.T) { + t.SkipNow() + run := CatchCLI([]string{"statup", "update"}) + assert.EqualError(t, run, "end") +} + +func TestTestPackageCLI(t *testing.T) { + run := CatchCLI([]string{"statup", "test", "plugins"}) + assert.EqualError(t, run, "end") +} + +func TestHelpCLI(t *testing.T) { + run := CatchCLI([]string{"statup", "help"}) + assert.EqualError(t, run, "end") +} + +func TestRunOnceCLI(t *testing.T) { + t.SkipNow() + run := CatchCLI([]string{"statup", "run"}) + assert.Nil(t, run) +} + +func TestEnvCLI(t *testing.T) { + run := CatchCLI([]string{"statup", "env"}) + assert.Error(t, run) +} diff --git a/cmd/main.go b/cmd/main.go index aba0fa47..71505801 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1,10 +1,27 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package main import ( + "flag" "fmt" "github.com/fatih/structs" "github.com/hunterlong/statup/core" "github.com/hunterlong/statup/handlers" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/types" "github.com/hunterlong/statup/utils" "github.com/joho/godotenv" @@ -16,31 +33,53 @@ import ( var ( VERSION string + COMMIT string usingEnv bool directory string + ipAddress string + port int ) func init() { - utils.InitLogs() - LoadDotEnvs() core.VERSION = VERSION } +func parseFlags() { + ip := flag.String("ip", "0.0.0.0", "IP address to run the Statup HTTP server") + p := flag.Int("port", 8080, "Port to run the HTTP server") + flag.Parse() + ipAddress = *ip + port = *p +} + func main() { var err error + parseFlags() + if len(os.Args) >= 2 { - CatchCLI(os.Args) - os.Exit(0) + err := CatchCLI(os.Args) + if err != nil { + if err.Error() == "end" { + os.Exit(0) + } + fmt.Println(err) + os.Exit(1) + } } + + utils.InitLogs() + source.Assets() + LoadDotEnvs() + utils.Log(1, fmt.Sprintf("Starting Statup v%v", VERSION)) - core.RenderBoxes() - core.HasAssets(directory) + source.HasAssets(directory) core.Configs, err = core.LoadConfig() if err != nil { utils.Log(3, err) core.SetupMode = true - handlers.RunHTTPServer() + fmt.Println(handlers.RunHTTPServer(ipAddress, port)) + os.Exit(1) } mainProcess() } @@ -66,7 +105,8 @@ func mainProcess() { if !core.SetupMode { LoadPlugins(false) - handlers.RunHTTPServer() + fmt.Println(handlers.RunHTTPServer(ipAddress, port)) + os.Exit(1) } } diff --git a/cmd/main_test.go b/cmd/main_test.go index d6e92207..f2081bb5 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package main import ( @@ -6,9 +21,9 @@ import ( "github.com/hunterlong/statup/core" "github.com/hunterlong/statup/handlers" "github.com/hunterlong/statup/notifiers" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/types" "github.com/hunterlong/statup/utils" - "github.com/rendon/testcli" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" @@ -26,10 +41,14 @@ var ( func init() { dir = utils.Directory + os.Remove(dir + "/statup.db") + //os.Remove(gopath+"/cmd/config.yml") + os.RemoveAll(dir + "/cmd/assets") + os.RemoveAll(dir + "/logs") } func RunInit(t *testing.T) { - core.RenderBoxes() + source.Assets() os.Remove(dir + "/statup.db") os.Remove(dir + "/cmd/config.yml") os.Remove(dir + "/cmd/index.html") @@ -39,9 +58,12 @@ func RunInit(t *testing.T) { } func TestRunAll(t *testing.T) { - t.Parallel() + //t.Parallel() - databases := []string{"mysql", "sqlite", "postgres"} + databases := []string{"sqlite", "postgres", "mysql"} + if os.Getenv("ONLY_DB") != "" { + databases = []string{os.Getenv("ONLY_DB")} + } for _, dbt := range databases { @@ -157,45 +179,18 @@ func TestRunAll(t *testing.T) { t.Run(dbt+" HTTP /settings", func(t *testing.T) { RunSettingsHandler(t) }) - //t.Run(dbt+" Cleanup", func(t *testing.T) { - // Cleanup(t) - //}) + t.Run(dbt+" Cleanup", func(t *testing.T) { + Cleanup(t) + }) } } -func TestVersionCommand(t *testing.T) { - c := testcli.Command("statup", "version") - c.Run() - t.Log(c.Stdout()) - assert.True(t, c.StdoutContains("Statup v")) -} - -func TestHelpCommand(t *testing.T) { - c := testcli.Command("statup", "help") - c.Run() - t.Log(c.Stdout()) - assert.True(t, c.StdoutContains("statup help - Shows the user basic information about Statup")) -} - -func TestExportCommand(t *testing.T) { - t.SkipNow() - c := testcli.Command("statup", "export") - c.Run() - t.Log(c.Stdout()) - assert.True(t, c.StdoutContains("Exporting Static 'index.html' page")) - assert.True(t, fileExists(dir+"/cmd/index.html")) -} - -func TestAssetsCommand(t *testing.T) { - c := testcli.Command("statup", "assets") - c.Run() - t.Log(c.Stdout()) - assert.True(t, fileExists(dir+"/assets/robots.txt")) - assert.True(t, fileExists(dir+"/assets/js/main.js")) - assert.True(t, fileExists(dir+"/assets/css/base.css")) - assert.True(t, fileExists(dir+"/assets/scss/base.scss")) +func Cleanup(t *testing.T) { + core.DbSession.ClearCache() + err := core.DbSession.Close() + assert.Nil(t, err) } func RunMakeDatabaseConfig(t *testing.T, db string) { @@ -251,7 +246,6 @@ func RunSelectCoreMYQL(t *testing.T, db string) { var err error core.CoreApp, err = core.SelectCore() assert.Nil(t, err) - t.Log(core.CoreApp) assert.Equal(t, "Testing "+db, core.CoreApp.Name) assert.Equal(t, db, core.CoreApp.DbConnection) assert.NotEmpty(t, core.CoreApp.ApiKey) @@ -481,6 +475,7 @@ func RunPrometheusHandler(t *testing.T) { route.ServeHTTP(rr, req) t.Log(rr.Body.String()) assert.True(t, strings.Contains(rr.Body.String(), "statup_total_services 6")) + assert.True(t, handlers.IsAuthenticated(req)) } func RunFailingPrometheusHandler(t *testing.T) { @@ -488,7 +483,8 @@ func RunFailingPrometheusHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() route.ServeHTTP(rr, req) - assert.Equal(t, 401, rr.Result().StatusCode) + assert.Equal(t, 303, rr.Result().StatusCode) + assert.True(t, handlers.IsAuthenticated(req)) } func RunLoginHandler(t *testing.T) { @@ -501,6 +497,7 @@ func RunLoginHandler(t *testing.T) { rr := httptest.NewRecorder() route.ServeHTTP(rr, req) assert.Equal(t, 303, rr.Result().StatusCode) + assert.True(t, handlers.IsAuthenticated(req)) } func RunDashboardHandler(t *testing.T) { @@ -510,6 +507,7 @@ func RunDashboardHandler(t *testing.T) { route.ServeHTTP(rr, req) assert.True(t, strings.Contains(rr.Body.String(), "Statup | Dashboard")) assert.True(t, strings.Contains(rr.Body.String(), "footer")) + assert.True(t, handlers.IsAuthenticated(req)) } func RunUsersHandler(t *testing.T) { @@ -519,6 +517,7 @@ func RunUsersHandler(t *testing.T) { route.ServeHTTP(rr, req) assert.True(t, strings.Contains(rr.Body.String(), "Statup | Users")) assert.True(t, strings.Contains(rr.Body.String(), "footer")) + assert.True(t, handlers.IsAuthenticated(req)) } func RunUserViewHandler(t *testing.T) { @@ -528,6 +527,7 @@ func RunUserViewHandler(t *testing.T) { route.ServeHTTP(rr, req) assert.True(t, strings.Contains(rr.Body.String(), "Statup | Users")) assert.True(t, strings.Contains(rr.Body.String(), "footer")) + assert.True(t, handlers.IsAuthenticated(req)) } func RunServicesHandler(t *testing.T) { @@ -537,6 +537,7 @@ func RunServicesHandler(t *testing.T) { route.ServeHTTP(rr, req) assert.True(t, strings.Contains(rr.Body.String(), "Statup | Services")) assert.True(t, strings.Contains(rr.Body.String(), "footer")) + assert.True(t, handlers.IsAuthenticated(req)) } func RunHelpHandler(t *testing.T) { @@ -546,6 +547,7 @@ func RunHelpHandler(t *testing.T) { route.ServeHTTP(rr, req) assert.True(t, strings.Contains(rr.Body.String(), "Statup | Help")) assert.True(t, strings.Contains(rr.Body.String(), "footer")) + assert.True(t, handlers.IsAuthenticated(req)) } func RunSettingsHandler(t *testing.T) { @@ -556,13 +558,7 @@ func RunSettingsHandler(t *testing.T) { assert.True(t, strings.Contains(rr.Body.String(), "Statup | Settings")) assert.True(t, strings.Contains(rr.Body.String(), "Theme Editor")) assert.True(t, strings.Contains(rr.Body.String(), "footer")) -} - -func Cleanup(t *testing.T) { - os.Remove(dir + "/statup.db") - //os.Remove(gopath+"/cmd/config.yml") - os.RemoveAll(dir + "/assets") - os.RemoveAll(dir + "/logs") + assert.True(t, handlers.IsAuthenticated(req)) } func fileExists(file string) bool { diff --git a/core/checker.go b/core/checker.go index 628b5049..e1a35c8f 100644 --- a/core/checker.go +++ b/core/checker.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( @@ -21,7 +36,7 @@ func CheckServices() { for _, ser := range CoreApp.Services { s := ser.ToService() //go obj.StartCheckins() - s.StopRoutine = make(chan struct{}) + s.Start() go CheckQueue(s) } } @@ -32,6 +47,7 @@ func CheckQueue(s *types.Service) { case <-s.StopRoutine: return default: + s = SelectService(s.Id).ToService() ServiceCheck(s) } time.Sleep(time.Duration(s.Interval) * time.Second) @@ -108,6 +124,7 @@ func ServiceHTTPCheck(s *types.Service) *types.Service { RecordFailure(s, fmt.Sprintf("HTTP Error %v", err)) return s } + response.Header.Set("Connection", "close") response.Header.Set("User-Agent", "StatupMonitor") t2 := time.Now() s.Latency = t2.Sub(t1).Seconds() diff --git a/core/checkin.go b/core/checkin.go index 8b0721ec..dbb584ff 100644 --- a/core/checkin.go +++ b/core/checkin.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( diff --git a/core/configs.go b/core/configs.go index 9829e98b..463d589f 100644 --- a/core/configs.go +++ b/core/configs.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( diff --git a/core/core.go b/core/core.go index 1f810cb3..bb5a7447 100644 --- a/core/core.go +++ b/core/core.go @@ -1,9 +1,25 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( - "github.com/GeertJohan/go.rice" "github.com/hunterlong/statup/notifiers" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/types" + "github.com/hunterlong/statup/utils" "github.com/pkg/errors" "os" "time" @@ -18,16 +34,10 @@ type Core struct { } var ( - Configs *types.Config - CoreApp *Core - SqlBox *rice.Box - CssBox *rice.Box - ScssBox *rice.Box - JsBox *rice.Box - TmplBox *rice.Box - SetupMode bool - UsingAssets bool - VERSION string + Configs *types.Config + CoreApp *Core + SetupMode bool + VERSION string ) func init() { @@ -78,28 +88,28 @@ func UpdateCore(c *Core) (*Core, error) { } func (c Core) UsingAssets() bool { - return UsingAssets + return source.UsingAssets } func (c Core) SassVars() string { - if !UsingAssets { + if !source.UsingAssets { return "" } - return OpenAsset(".", "scss/variables.scss") + return source.OpenAsset(utils.Directory, "scss/variables.scss") } func (c Core) BaseSASS() string { - if !UsingAssets { + if !source.UsingAssets { return "" } - return OpenAsset(".", "scss/base.scss") + return source.OpenAsset(utils.Directory, "scss/base.scss") } func (c Core) MobileSASS() string { - if !UsingAssets { + if !source.UsingAssets { return "" } - return OpenAsset(".", "scss/mobile.scss") + return source.OpenAsset(utils.Directory, "scss/mobile.scss") } func (c Core) AllOnline() bool { diff --git a/core/core_test.go b/core/core_test.go index d2792f51..f5e96b0d 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -1,24 +1,37 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/utils" "github.com/stretchr/testify/assert" - "os" "testing" ) var ( testCore *Core testConfig *DbConfig - gopath string + dir string ) func init() { - gopath = os.Getenv("GOPATH") - gopath += "/src/github.com/hunterlong/statup" - + dir = utils.Directory utils.InitLogs() - RenderBoxes() + source.Assets() } func TestNewCore(t *testing.T) { @@ -31,14 +44,14 @@ func TestDbConfig_Save(t *testing.T) { testConfig = &DbConfig{ DbConn: "sqlite", Project: "Tester", - Location: gopath, + Location: dir, } err := testConfig.Save() assert.Nil(t, err) } func TestDbConnection(t *testing.T) { - err := DbConnection(testConfig.DbConn, false, gopath) + err := DbConnection(testConfig.DbConn, false, dir) assert.Nil(t, err) } @@ -69,33 +82,14 @@ func TestSelectLastMigration(t *testing.T) { assert.NotZero(t, id) } -func TestCore_UsingAssets(t *testing.T) { - assert.False(t, testCore.UsingAssets()) -} - -func TestHasAssets(t *testing.T) { - assert.False(t, HasAssets(gopath)) -} - -func TestCreateAssets(t *testing.T) { - assert.Nil(t, CreateAllAssets(gopath)) - assert.True(t, HasAssets(gopath)) -} - -func TestCompileSASS(t *testing.T) { - t.SkipNow() - os.Setenv("SASS", "sass") - os.Setenv("CMD_FILE", gopath+"/cmd.sh") - assert.Nil(t, CompileSASS(gopath)) - assert.True(t, HasAssets(gopath)) -} - -func TestDeleteAssets(t *testing.T) { - assert.Nil(t, DeleteAllAssets(gopath)) - assert.False(t, HasAssets(gopath)) -} - func TestInsertNotifierDB(t *testing.T) { err := InsertNotifierDB() assert.Nil(t, err) } + +func TestExportStaticHTML(t *testing.T) { + data := ExportIndexHTML() + assert.Contains(t, data, "Statup made with ❤️") + assert.Contains(t, data, "") + assert.Contains(t, data, "") +} diff --git a/core/database.go b/core/database.go index ff923d6f..e9cc2f0b 100644 --- a/core/database.go +++ b/core/database.go @@ -1,8 +1,24 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( "fmt" "github.com/go-yaml/yaml" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/types" "github.com/hunterlong/statup/utils" "os" @@ -179,7 +195,7 @@ func RunDatabaseUpgrades() error { return err } utils.Log(1, fmt.Sprintf("Checking for Database Upgrades since #%v", currentMigration)) - upgrade, _ := SqlBox.String(CoreApp.DbConnection + "_upgrade.sql") + upgrade, _ := source.SqlBox.String(CoreApp.DbConnection + "_upgrade.sql") // parse db version and upgrade file ups := strings.Split(upgrade, "=========================================== ") ups = reverseSlice(ups) @@ -226,7 +242,7 @@ func RunDatabaseUpgrades() error { func DropDatabase() error { utils.Log(1, "Dropping Database Tables...") - down, err := SqlBox.String("down.sql") + down, err := source.SqlBox.String("down.sql") if err != nil { return err } @@ -248,7 +264,7 @@ func CreateDatabase() error { } else if CoreApp.DbConnection == "sqlite" { sql = "sqlite_up.sql" } - up, err := SqlBox.String(sql) + up, err := source.SqlBox.String(sql) requests := strings.Split(up, ";") for _, request := range requests { _, err := DbSession.Exec(request) diff --git a/core/events.go b/core/events.go index 2cfe3216..27555ae4 100644 --- a/core/events.go +++ b/core/events.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( diff --git a/core/export.go b/core/export.go index e372b476..a8878d78 100644 --- a/core/export.go +++ b/core/export.go @@ -1,18 +1,35 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( "bytes" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/utils" "html/template" "io/ioutil" ) func ExportIndexHTML() string { + source.Assets() CoreApp.UseCdn = true //out := index{*CoreApp, CoreApp.Services} - nav, _ := TmplBox.String("nav.html") - footer, _ := TmplBox.String("footer.html") - render, err := TmplBox.String("index.html") + nav, _ := source.TmplBox.String("nav.html") + footer, _ := source.TmplBox.String("footer.html") + render, err := source.TmplBox.String("index.html") if err != nil { utils.Log(3, err) } @@ -27,6 +44,12 @@ func ExportIndexHTML() string { "VERSION": func() string { return VERSION }, + "CoreApp": func() *Core { + return CoreApp + }, + "USE_CDN": func() bool { + return CoreApp.UseCdn + }, "underscore": func(html string) string { return utils.UnderScoreString(html) }, diff --git a/core/failures.go b/core/failures.go index b25cbbe2..ba9e8df2 100644 --- a/core/failures.go +++ b/core/failures.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( diff --git a/core/hits.go b/core/hits.go index 38a9f092..59c00d5a 100644 --- a/core/hits.go +++ b/core/hits.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( diff --git a/core/services.go b/core/services.go index 0194d296..3fc88c48 100644 --- a/core/services.go +++ b/core/services.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( @@ -38,7 +53,7 @@ func SelectAllServices() ([]*Service, error) { col := serviceCol().Find() err := col.All(&services) if err != nil { - utils.Log(3, err) + utils.Log(3, fmt.Sprintf("service error: %v", err)) return nil, err } for _, s := range services { @@ -220,16 +235,17 @@ func DeleteService(u *types.Service) error { return err } -func UpdateService(u *types.Service) *types.Service { - u.CreatedAt = time.Now() - res := serviceCol().Find("id", u.Id) - err := res.Update(u) +func UpdateService(service *types.Service) *types.Service { + service.CreatedAt = time.Now() + res := serviceCol().Find("id", service.Id) + err := res.Update(service) if err != nil { - utils.Log(3, fmt.Sprintf("Failed to update service %v. %v", u.Name, err)) + utils.Log(3, fmt.Sprintf("Failed to update service %v. %v", service.Name, err)) + return service } - updateService(u) - OnUpdateService(u) - return u + CoreApp.Services, _ = SelectAllServices() + OnUpdateService(service) + return service } func updateService(u *types.Service) { @@ -251,7 +267,7 @@ func CreateService(u *types.Service) (int64, error) { return 0, err } u.Id = uuid.(int64) - u.StopRoutine = make(chan struct{}) + u.StopRoutine = make(chan bool) CoreApp.Services = append(CoreApp.Services, &Service{u}) return uuid.(int64), err } diff --git a/core/services_test.go b/core/services_test.go index e974a562..683b0aa7 100644 --- a/core/services_test.go +++ b/core/services_test.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( @@ -24,7 +39,7 @@ func TestSelectHTTPService(t *testing.T) { func TestSelectTCPService(t *testing.T) { service := SelectService(5) - assert.Equal(t, "Postgres TCP Check", service.ToService().Name) + assert.Equal(t, "Google DNS", service.ToService().Name) assert.Equal(t, "tcp", service.ToService().Type) } @@ -55,17 +70,68 @@ func TestCheckHTTPService(t *testing.T) { func TestServiceTCPCheck(t *testing.T) { service := SelectService(5) checked := ServiceCheck(service.ToService()) - assert.Equal(t, "Postgres TCP Check", checked.Name) + assert.Equal(t, "Google DNS", checked.Name) assert.True(t, checked.Online) } func TestCheckTCPService(t *testing.T) { service := SelectService(5).ToService() - assert.Equal(t, "Postgres TCP Check", service.Name) + assert.Equal(t, "Google DNS", service.Name) assert.True(t, service.Online) assert.NotZero(t, service.Latency) } +func TestServiceOnline24Hours(t *testing.T) { + service := SelectService(5) + amount := service.Online24() + assert.Equal(t, float32(100), amount) +} + +func TestServiceSmallText(t *testing.T) { + service := SelectService(5) + text := service.SmallText() + assert.Contains(t, text, "Online since") +} + +func TestServiceAvgUptime(t *testing.T) { + service := SelectService(5) + uptime := service.AvgUptime() + assert.Equal(t, "100", uptime) +} + +func TestServiceHits(t *testing.T) { + service := SelectService(5) + hits, err := service.Hits() + assert.Nil(t, err) + assert.Equal(t, int(1), len(hits)) +} + +func TestServiceLimitedHits(t *testing.T) { + service := SelectService(5) + hits, err := service.LimitedHits() + assert.Nil(t, err) + assert.Equal(t, int(1), len(hits)) +} + +func TestServiceTotalHits(t *testing.T) { + service := SelectService(5) + hits, err := service.TotalHits() + assert.Nil(t, err) + assert.Equal(t, uint64(0x1), hits) +} + +func TestServiceSum(t *testing.T) { + service := SelectService(5) + sum, err := service.Sum() + assert.Nil(t, err) + assert.NotZero(t, sum) +} + +func TestCountOnline(t *testing.T) { + amount := CountOnline() + assert.Equal(t, 2, amount) +} + func TestCreateService(t *testing.T) { s := &types.Service{ Name: "Interpol - All The Rage Back Home", diff --git a/core/setup.go b/core/setup.go index bea7f69f..c54d5473 100644 --- a/core/setup.go +++ b/core/setup.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( @@ -59,11 +74,11 @@ func LoadSampleData() error { Timeout: 30, } s5 := &types.Service{ - Name: "Postgres TCP Check", - Domain: "0.0.0.0", + Name: "Google DNS", + Domain: "8.8.8.8", Interval: 20, Type: "tcp", - Port: 5432, + Port: 53, Timeout: 120, } id, err := CreateService(s1) diff --git a/core/users.go b/core/users.go index e203b248..2a1c9237 100644 --- a/core/users.go +++ b/core/users.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( diff --git a/core/users_test.go b/core/users_test.go index 2e214c9f..88878396 100644 --- a/core/users_test.go +++ b/core/users_test.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package core import ( @@ -31,16 +46,68 @@ func TestSelectUser(t *testing.T) { assert.True(t, user.Admin) } +func TestSelectUsername(t *testing.T) { + user, err := SelectUsername("hunter") + assert.Nil(t, err) + assert.Equal(t, "test@email.com", user.Email) + assert.Equal(t, int64(1), user.Id) + assert.True(t, user.Admin) +} + func TestUpdateUser(t *testing.T) { user, err := SelectUser(1) assert.Nil(t, err) - user.Username = "updated" - err = UpdateUser(user) assert.Nil(t, err) - updatedUser, err := SelectUser(1) assert.Nil(t, err) assert.Equal(t, "updated", updatedUser.Username) } + +func TestCreateUser2(t *testing.T) { + user := &types.User{ + Username: "hunterlong", + Password: "password123", + Email: "user@email.com", + Admin: true, + } + userId, err := CreateUser(user) + assert.Nil(t, err) + assert.NotZero(t, userId) +} + +func TestSelectAllUsersAgain(t *testing.T) { + users, err := SelectAllUsers() + assert.Nil(t, err) + assert.Equal(t, 2, len(users)) +} + +func TestAuthUser(t *testing.T) { + user, auth := AuthUser("hunterlong", "password123") + assert.True(t, auth) + assert.NotNil(t, user) + assert.Equal(t, "user@email.com", user.Email) + assert.Equal(t, int64(2), user.Id) + assert.True(t, user.Admin) +} + +func TestFailedAuthUser(t *testing.T) { + user, auth := AuthUser("hunter", "wrongpassword") + assert.False(t, auth) + assert.Nil(t, user) +} + +func TestCheckPassword(t *testing.T) { + user, err := SelectUser(2) + assert.Nil(t, err) + pass := CheckHash("password123", user.Password) + assert.True(t, pass) +} + +func TestDeleteUser(t *testing.T) { + user, err := SelectUser(2) + assert.Nil(t, err) + err = DeleteUser(user) + assert.Nil(t, err) +} diff --git a/handlers/api.go b/handlers/api.go index bedc8eb4..2c6d6c77 100644 --- a/handlers/api.go +++ b/handlers/api.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( diff --git a/handlers/dashboard.go b/handlers/dashboard.go index 7def14f7..cc7d3a6c 100644 --- a/handlers/dashboard.go +++ b/handlers/dashboard.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( diff --git a/handlers/handlers.go b/handlers/handlers.go index 370af2c4..bbdb0f0c 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -1,9 +1,25 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( "fmt" "github.com/gorilla/sessions" "github.com/hunterlong/statup/core" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/types" "github.com/hunterlong/statup/utils" "html/template" @@ -20,28 +36,25 @@ var ( Store *sessions.CookieStore ) -func RunHTTPServer() { - utils.Log(1, "Statup HTTP Server running on http://localhost:8080") - r := Router() - for _, p := range core.CoreApp.AllPlugins { - info := p.GetInfo() - for _, route := range p.Routes() { - path := fmt.Sprintf("%v", route.URL) - r.Handle(path, http.HandlerFunc(route.Handler)).Methods(route.Method) - utils.Log(1, fmt.Sprintf("Added Route %v for plugin %v\n", path, info.Name)) - } - } +func RunHTTPServer(ip string, port int) error { + host := fmt.Sprintf("%v:%v", ip, port) + utils.Log(1, "Statup HTTP Server running on http://"+host) + //for _, p := range core.CoreApp.AllPlugins { + // info := p.GetInfo() + // for _, route := range p.Routes() { + // path := fmt.Sprintf("%v", route.URL) + // r.Handle(path, http.HandlerFunc(route.Handler)).Methods(route.Method) + // utils.Log(1, fmt.Sprintf("Added Route %v for plugin %v\n", path, info.Name)) + // } + //} srv := &http.Server{ - Addr: "0.0.0.0:8080", + Addr: host, WriteTimeout: time.Second * 15, ReadTimeout: time.Second * 15, IdleTimeout: time.Second * 60, - Handler: r, - } - err := srv.ListenAndServe() - if err != nil { - utils.Log(4, err) + Handler: Router(), } + return srv.ListenAndServe() } func IsAuthenticated(r *http.Request) bool { @@ -66,9 +79,9 @@ func IsAuthenticated(r *http.Request) bool { func ExecuteResponse(w http.ResponseWriter, r *http.Request, file string, data interface{}) { utils.Http(r) - nav, _ := core.TmplBox.String("nav.html") - footer, _ := core.TmplBox.String("footer.html") - render, err := core.TmplBox.String(file) + nav, _ := source.TmplBox.String("nav.html") + footer, _ := source.TmplBox.String("footer.html") + render, err := source.TmplBox.String(file) if err != nil { utils.Log(4, err) } @@ -86,6 +99,9 @@ func ExecuteResponse(w http.ResponseWriter, r *http.Request, file string, data i "VERSION": func() string { return core.VERSION }, + "CoreApp": func() *core.Core { + return core.CoreApp + }, "USE_CDN": func() bool { return core.CoreApp.UseCdn }, @@ -100,7 +116,7 @@ func ExecuteResponse(w http.ResponseWriter, r *http.Request, file string, data i } func ExecuteJSResponse(w http.ResponseWriter, r *http.Request, file string, data interface{}) { - render, err := core.JsBox.String(file) + render, err := source.JsBox.String(file) if err != nil { utils.Log(4, err) } @@ -114,4 +130,9 @@ func ExecuteJSResponse(w http.ResponseWriter, r *http.Request, file string, data t.Execute(w, data) } +func Error404Handler(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusNotFound) + ExecuteResponse(w, r, "error_404.html", nil) +} + type DbConfig types.DbConfig diff --git a/handlers/handlers_test.go b/handlers/handlers_test.go index ce906976..ac2d9947 100644 --- a/handlers/handlers_test.go +++ b/handlers/handlers_test.go @@ -1,19 +1,55 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( "github.com/hunterlong/statup/core" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/utils" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" "net/url" + "os" "strings" "testing" ) func init() { utils.InitLogs() - core.RenderBoxes() + source.Assets() +} + +func IsRouteAuthenticated(req *http.Request) bool { + os.Setenv("GO_ENV", "production") + rr := httptest.NewRecorder() + req.Header.Set("Authorization", "badkey") + Router().ServeHTTP(rr, req) + code := rr.Code + if code == 200 { + os.Setenv("GO_ENV", "test") + return false + } + os.Setenv("GO_ENV", "test") + return true +} + +func TestFailedHTTPServer(t *testing.T) { + err := RunHTTPServer("missinghost", 0) + assert.Error(t, err) } func TestIndexHandler(t *testing.T) { @@ -84,6 +120,14 @@ func TestServicesViewHandler(t *testing.T) { assert.Contains(t, body, "Statup made with ❤️") } +func TestMissingServiceViewHandler(t *testing.T) { + req, err := http.NewRequest("GET", "/service/99999999", nil) + assert.Nil(t, err) + rr := httptest.NewRecorder() + Router().ServeHTTP(rr, req) + assert.Equal(t, 404, rr.Code) +} + func TestServiceChartHandler(t *testing.T) { req, err := http.NewRequest("GET", "/charts.js", nil) assert.Nil(t, err) @@ -93,8 +137,6 @@ func TestServiceChartHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "var ctx_1") assert.Contains(t, body, "var ctx_2") - assert.Contains(t, body, "var ctx_3") - assert.Contains(t, body, "var ctx_4") } func TestDashboardHandler(t *testing.T) { @@ -143,6 +185,7 @@ func TestServicesHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "Statup | Services") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestCreateUserHandler(t *testing.T) { @@ -157,6 +200,7 @@ func TestCreateUserHandler(t *testing.T) { rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) assert.Equal(t, 303, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestEditUserHandler(t *testing.T) { @@ -174,6 +218,7 @@ func TestEditUserHandler(t *testing.T) { assert.Contains(t, body, "admin") assert.Contains(t, body, "changedusername") assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestDeleteUserHandler(t *testing.T) { @@ -182,6 +227,7 @@ func TestDeleteUserHandler(t *testing.T) { rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) assert.Equal(t, 303, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestUsersHandler(t *testing.T) { @@ -195,6 +241,7 @@ func TestUsersHandler(t *testing.T) { assert.Contains(t, body, "admin") assert.NotContains(t, body, "changedusername") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestUsersEditHandler(t *testing.T) { @@ -209,6 +256,7 @@ func TestUsersEditHandler(t *testing.T) { assert.Contains(t, body, "value=\"info@statup.io\"") assert.Contains(t, body, "value=\"##########\"") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestSettingsHandler(t *testing.T) { @@ -220,6 +268,7 @@ func TestSettingsHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "Statup | Settings") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestHelpHandler(t *testing.T) { @@ -231,6 +280,7 @@ func TestHelpHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "Statup | Help") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestCreateHTTPServiceHandler(t *testing.T) { @@ -250,7 +300,8 @@ func TestCreateHTTPServiceHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestCreateTCPerviceHandler(t *testing.T) { @@ -270,7 +321,8 @@ func TestCreateTCPerviceHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestServicesHandler2(t *testing.T) { @@ -284,6 +336,7 @@ func TestServicesHandler2(t *testing.T) { assert.Contains(t, body, "Crystal Castles - Kept") assert.Contains(t, body, "Local Postgres") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestViewHTTPServicesHandler(t *testing.T) { @@ -309,11 +362,13 @@ func TestViewTCPServicesHandler(t *testing.T) { } func TestServicesDeleteFailuresHandler(t *testing.T) { + t.SkipNow() req, err := http.NewRequest("GET", "/service/7/delete_failures", nil) assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestServicesUpdateHandler(t *testing.T) { @@ -336,6 +391,7 @@ func TestServicesUpdateHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "Statup | The Bravery - An Honest Mistake Service") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestDeleteServiceHandler(t *testing.T) { @@ -343,11 +399,11 @@ func TestDeleteServiceHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestLogsHandler(t *testing.T) { - t.SkipNow() req, err := http.NewRequest("GET", "/logs", nil) assert.Nil(t, err) rr := httptest.NewRecorder() @@ -356,10 +412,10 @@ func TestLogsHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "Statup | Logs") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestLogsLineHandler(t *testing.T) { - t.SkipNow() req, err := http.NewRequest("GET", "/logs/line", nil) assert.Nil(t, err) rr := httptest.NewRecorder() @@ -368,6 +424,7 @@ func TestLogsLineHandler(t *testing.T) { assert.Equal(t, 200, rr.Code) t.Log(body) assert.NotEmpty(t, body) + assert.True(t, IsRouteAuthenticated(req)) } func TestSaveSettingsHandler(t *testing.T) { @@ -379,7 +436,8 @@ func TestSaveSettingsHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestViewSettingsHandler(t *testing.T) { @@ -392,6 +450,7 @@ func TestViewSettingsHandler(t *testing.T) { assert.Contains(t, body, "Statup | Settings") assert.Contains(t, body, "Awesome Status") assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) } func TestSaveAssetsHandler(t *testing.T) { @@ -399,11 +458,12 @@ func TestSaveAssetsHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) assert.FileExists(t, utils.Directory+"/assets/css/base.css") assert.FileExists(t, utils.Directory+"/assets/js/main.js") assert.DirExists(t, utils.Directory+"/assets") - assert.True(t, core.UsingAssets) + assert.True(t, source.UsingAssets) + assert.True(t, IsRouteAuthenticated(req)) } func TestDeleteAssetsHandler(t *testing.T) { @@ -411,8 +471,9 @@ func TestDeleteAssetsHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) - assert.False(t, core.UsingAssets) + assert.Equal(t, 200, rr.Code) + assert.False(t, source.UsingAssets) + assert.True(t, IsRouteAuthenticated(req)) } func TestPrometheusHandler(t *testing.T) { @@ -424,6 +485,7 @@ func TestPrometheusHandler(t *testing.T) { body := rr.Body.String() assert.Equal(t, 200, rr.Code) assert.Contains(t, body, "statup_total_services 6") + assert.True(t, IsRouteAuthenticated(req)) } func TestSaveNotificationHandler(t *testing.T) { @@ -443,7 +505,8 @@ func TestSaveNotificationHandler(t *testing.T) { assert.Nil(t, err) rr := httptest.NewRecorder() Router().ServeHTTP(rr, req) - assert.Equal(t, 303, rr.Code) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) } func TestViewNotificationSettingsHandler(t *testing.T) { @@ -462,6 +525,27 @@ func TestViewNotificationSettingsHandler(t *testing.T) { assert.Contains(t, body, `value="7" id="limits_per_hour_email"`) assert.Contains(t, body, `id="switch-email" checked`) assert.Contains(t, body, "Statup made with ❤️") + assert.True(t, IsRouteAuthenticated(req)) +} + +func TestSaveFooterHandler(t *testing.T) { + form := url.Values{} + form.Add("footer", "Created by Hunter Long") + req, err := http.NewRequest("POST", "/settings", strings.NewReader(form.Encode())) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + assert.Nil(t, err) + rr := httptest.NewRecorder() + Router().ServeHTTP(rr, req) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) + + req, err = http.NewRequest("GET", "/", nil) + assert.Nil(t, err) + rr = httptest.NewRecorder() + Router().ServeHTTP(rr, req) + body := rr.Body.String() + assert.Equal(t, 200, rr.Code) + assert.Contains(t, body, "Created by Hunter Long") } func TestError404Handler(t *testing.T) { @@ -479,3 +563,32 @@ func TestLogoutHandler(t *testing.T) { Router().ServeHTTP(rr, req) assert.Equal(t, 303, rr.Code) } + +func TestBuildAssetsHandler(t *testing.T) { + req, err := http.NewRequest("GET", "/settings/build", nil) + assert.Nil(t, err) + rr := httptest.NewRecorder() + Router().ServeHTTP(rr, req) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) + assert.FileExists(t, "../assets/scss/base.scss") +} + +func TestSaveSassHandler(t *testing.T) { + base := source.OpenAsset(utils.Directory, "scss/base.scss") + vars := source.OpenAsset(utils.Directory, "scss/variables.scss") + + form := url.Values{} + form.Add("theme", base+"\n .test_design { color: $test-design; }") + form.Add("variables", vars+"\n $test-design: #ffffff; ") + req, err := http.NewRequest("POST", "/settings/css", strings.NewReader(form.Encode())) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + assert.Nil(t, err) + rr := httptest.NewRecorder() + Router().ServeHTTP(rr, req) + assert.Equal(t, 200, rr.Code) + assert.True(t, IsRouteAuthenticated(req)) + + newBase := source.OpenAsset(utils.Directory, "css/base.css") + assert.Contains(t, newBase, ".test_design {") +} diff --git a/handlers/index.go b/handlers/index.go index f5cf56c3..09dd0b30 100644 --- a/handlers/index.go +++ b/handlers/index.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( diff --git a/handlers/misc.go b/handlers/misc.go deleted file mode 100644 index 03ec423c..00000000 --- a/handlers/misc.go +++ /dev/null @@ -1,10 +0,0 @@ -package handlers - -import ( - "net/http" -) - -func Error404Handler(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusNotFound) - ExecuteResponse(w, r, "error_404.html", nil) -} diff --git a/handlers/plugins.go b/handlers/plugins.go index 66606310..f4e55e6b 100644 --- a/handlers/plugins.go +++ b/handlers/plugins.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( diff --git a/handlers/prometheus.go b/handlers/prometheus.go index efdace07..ce858c70 100644 --- a/handlers/prometheus.go +++ b/handlers/prometheus.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( @@ -21,7 +36,7 @@ import ( func PrometheusHandler(w http.ResponseWriter, r *http.Request) { utils.Log(1, fmt.Sprintf("Prometheus /metrics Request From IP: %v\n", r.RemoteAddr)) if !isAuthorized(r) { - http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized) + http.Redirect(w, r, "/", http.StatusSeeOther) return } metrics := []string{} diff --git a/handlers/routes.go b/handlers/routes.go index 7a5c74e2..cd899167 100644 --- a/handlers/routes.go +++ b/handlers/routes.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( @@ -5,6 +20,7 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/sessions" "github.com/hunterlong/statup/core" + "github.com/hunterlong/statup/source" "net/http" "time" ) @@ -68,7 +84,7 @@ func Router() *mux.Router { } func LocalizedAssets(r *mux.Router) *mux.Router { - if core.UsingAssets { + if source.UsingAssets { cssHandler := http.FileServer(http.Dir("./assets/css")) jsHandler := http.FileServer(http.Dir("./assets/js")) indexHandler := http.FileServer(http.Dir("./assets/")) @@ -76,11 +92,13 @@ func LocalizedAssets(r *mux.Router) *mux.Router { r.PathPrefix("/js/").Handler(http.StripPrefix("/js/", jsHandler)) r.PathPrefix("/robots.txt").Handler(indexHandler) r.PathPrefix("/favicon.ico").Handler(indexHandler) + r.PathPrefix("/statup.png").Handler(indexHandler) } else { - r.PathPrefix("/css/").Handler(http.StripPrefix("/css/", http.FileServer(core.CssBox.HTTPBox()))) - r.PathPrefix("/js/").Handler(http.StripPrefix("/js/", http.FileServer(core.JsBox.HTTPBox()))) - r.PathPrefix("/robots.txt").Handler(http.FileServer(core.TmplBox.HTTPBox())) - r.PathPrefix("/favicon.ico").Handler(http.FileServer(core.TmplBox.HTTPBox())) + r.PathPrefix("/css/").Handler(http.StripPrefix("/css/", http.FileServer(source.CssBox.HTTPBox()))) + r.PathPrefix("/js/").Handler(http.StripPrefix("/js/", http.FileServer(source.JsBox.HTTPBox()))) + r.PathPrefix("/robots.txt").Handler(http.FileServer(source.TmplBox.HTTPBox())) + r.PathPrefix("/favicon.ico").Handler(http.FileServer(source.TmplBox.HTTPBox())) + r.PathPrefix("/statup.png").Handler(http.FileServer(source.TmplBox.HTTPBox())) } return r } diff --git a/handlers/services.go b/handlers/services.go index 39c2620a..86891b37 100644 --- a/handlers/services.go +++ b/handlers/services.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( @@ -62,7 +77,7 @@ func CreateServiceHandler(w http.ResponseWriter, r *http.Request) { go core.CheckQueue(service) core.OnNewService(service) - http.Redirect(w, r, "/services", http.StatusSeeOther) + ExecuteResponse(w, r, "services.html", core.CoreApp.Services) } func ServicesDeleteHandler(w http.ResponseWriter, r *http.Request) { @@ -74,12 +89,16 @@ func ServicesDeleteHandler(w http.ResponseWriter, r *http.Request) { serv := core.SelectService(utils.StringInt(vars["id"])) service := serv.ToService() core.DeleteService(service) - http.Redirect(w, r, "/services", http.StatusSeeOther) + ExecuteResponse(w, r, "services.html", core.CoreApp.Services) } func ServicesViewHandler(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) serv := core.SelectService(utils.StringInt(vars["id"])) + if serv == nil { + w.WriteHeader(http.StatusNotFound) + return + } ExecuteResponse(w, r, "service.html", serv) } @@ -116,6 +135,8 @@ func ServicesUpdateHandler(w http.ResponseWriter, r *http.Request) { Timeout: timeout, } service = core.UpdateService(serviceUpdate) + core.CoreApp.Services, _ = core.SelectAllServices() + serv = core.SelectService(service.Id) ExecuteResponse(w, r, "service.html", serv) } @@ -130,7 +151,7 @@ func ServicesDeleteFailuresHandler(w http.ResponseWriter, r *http.Request) { service := serv.ToService() core.DeleteFailures(service) core.CoreApp.Services, _ = core.SelectAllServices() - http.Redirect(w, r, "/services", http.StatusSeeOther) + ExecuteResponse(w, r, "services.html", core.CoreApp.Services) } func CheckinCreateUpdateHandler(w http.ResponseWriter, r *http.Request) { diff --git a/handlers/settings.go b/handlers/settings.go index afb28313..903397e5 100644 --- a/handlers/settings.go +++ b/handlers/settings.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( @@ -5,6 +20,7 @@ import ( "github.com/gorilla/mux" "github.com/hunterlong/statup/core" "github.com/hunterlong/statup/notifiers" + "github.com/hunterlong/statup/source" "github.com/hunterlong/statup/utils" "net/http" ) @@ -46,7 +62,7 @@ func SaveSettingsHandler(w http.ResponseWriter, r *http.Request) { core.CoreApp.UseCdn = (r.PostForm.Get("enable_cdn") == "on") core.CoreApp, _ = core.UpdateCore(core.CoreApp) core.OnSettingsSaved(core.CoreApp.ToCore()) - http.Redirect(w, r, "/settings", http.StatusSeeOther) + ExecuteResponse(w, r, "settings.html", core.CoreApp) } func SaveSASSHandler(w http.ResponseWriter, r *http.Request) { @@ -57,10 +73,10 @@ func SaveSASSHandler(w http.ResponseWriter, r *http.Request) { r.ParseForm() theme := r.PostForm.Get("theme") variables := r.PostForm.Get("variables") - core.SaveAsset(theme, ".", "scss/base.scss") - core.SaveAsset(variables, ".", "scss/variables.scss") - core.CompileSASS(".") - http.Redirect(w, r, "/settings", http.StatusSeeOther) + source.SaveAsset([]byte(theme), utils.Directory, "scss/base.scss") + source.SaveAsset([]byte(variables), utils.Directory, "scss/variables.scss") + source.CompileSASS(utils.Directory) + ExecuteResponse(w, r, "settings.html", core.CoreApp) } func SaveAssetsHandler(w http.ResponseWriter, r *http.Request) { @@ -69,25 +85,29 @@ func SaveAssetsHandler(w http.ResponseWriter, r *http.Request) { return } dir := utils.Directory - core.CreateAllAssets(dir) - err := core.CompileSASS(dir) + err := source.CreateAllAssets(dir) if err != nil { - core.CopyToPublic(core.CssBox, dir+"/assets/css", "base.css") - utils.Log(2, "Default 'base.css' was insert because SASS did not work.") - } - core.UsingAssets = true - http.Redirect(w, r, "/settings", http.StatusSeeOther) -} - -func DeleteAssetsHandler(w http.ResponseWriter, req *http.Request) { - if !IsAuthenticated(req) { - http.Redirect(w, req, "/", http.StatusSeeOther) + utils.Log(3, err) return } - core.DeleteAllAssets(".") - core.UsingAssets = false - LocalizedAssets(r) - http.Redirect(w, req, "/settings", http.StatusSeeOther) + err = source.CompileSASS(dir) + if err != nil { + source.CopyToPublic(source.CssBox, dir+"/assets/css", "base.css") + utils.Log(2, "Default 'base.css' was insert because SASS did not work.") + } + source.UsingAssets = true + ExecuteResponse(w, r, "settings.html", core.CoreApp) +} + +func DeleteAssetsHandler(w http.ResponseWriter, r *http.Request) { + if !IsAuthenticated(r) { + http.Redirect(w, r, "/", http.StatusSeeOther) + return + } + source.DeleteAllAssets(".") + source.UsingAssets = false + LocalizedAssets(Router()) + ExecuteResponse(w, r, "settings.html", core.CoreApp) } func SaveNotificationHandler(w http.ResponseWriter, r *http.Request) { @@ -157,5 +177,5 @@ func SaveNotificationHandler(w http.ResponseWriter, r *http.Request) { utils.Log(1, fmt.Sprintf("Notifier saved: %v", notifer)) - http.Redirect(w, r, "/settings", http.StatusSeeOther) + ExecuteResponse(w, r, "settings.html", core.CoreApp) } diff --git a/handlers/setup.go b/handlers/setup.go index be3f4c69..6cc25c1a 100644 --- a/handlers/setup.go +++ b/handlers/setup.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( diff --git a/handlers/users.go b/handlers/users.go index b1876cb8..14d165ef 100644 --- a/handlers/users.go +++ b/handlers/users.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package handlers import ( diff --git a/notifiers/email.go b/notifiers/email.go index 5ada4a6f..15a1da16 100644 --- a/notifiers/email.go +++ b/notifiers/email.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package notifiers import ( diff --git a/notifiers/notifiers.go b/notifiers/notifiers.go index f1b2c8e4..0e750ea7 100644 --- a/notifiers/notifiers.go +++ b/notifiers/notifiers.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package notifiers import ( diff --git a/notifiers/notifiers_test.go b/notifiers/notifiers_test.go index a1b60460..e0206ecb 100644 --- a/notifiers/notifiers_test.go +++ b/notifiers/notifiers_test.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package notifiers import ( diff --git a/notifiers/rice-box.go b/notifiers/rice-box.go index fc32458a..7ee585e4 100644 --- a/notifiers/rice-box.go +++ b/notifiers/rice-box.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package notifiers import ( diff --git a/notifiers/slack.go b/notifiers/slack.go index f7df1b9d..a4d941fd 100644 --- a/notifiers/slack.go +++ b/notifiers/slack.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package notifiers import ( diff --git a/notifiers/twilio.go b/notifiers/twilio.go index c14d5c47..9db78012 100644 --- a/notifiers/twilio.go +++ b/notifiers/twilio.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package notifiers import ( diff --git a/plugin/main.go b/plugin/main.go index 645f9bd0..27585580 100644 --- a/plugin/main.go +++ b/plugin/main.go @@ -1,3 +1,18 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package plugin import ( diff --git a/servers/docker-compose-test.yml b/servers/docker-compose-test.yml new file mode 100644 index 00000000..93247eb6 --- /dev/null +++ b/servers/docker-compose-test.yml @@ -0,0 +1,51 @@ +version: '2.3' + +services: + + statup: + container_name: statup + image: hunterlong/statup:dev + networks: + - internet + - database + depends_on: + - postgres_statup + - postgres_mysql + entrypoint: + - "sleep 30 && cd /go/src/github.com/hunterlong/statup && go test -v ./..." + environment: + GO_ENV: test + DB_CONN: postgres + DB_HOST: postgres_statup + DB_USER: root + DB_PASS: root + DB_DATABASE: statup + NAME: EC2 Example + DESCRIPTION: This is a Statup Docker Compose instance + + postgres_statup: + container_name: postgres_statup + image: postgres + restart: always + networks: + - database + environment: + POSTGRES_PASSWORD: password123 + POSTGRES_USER: statup + POSTGRES_DB: statup + + postgres_mysql: + container_name: mysql_statup + image: mysql + restart: always + networks: + - database + environment: + MYSQL_ROOT_PASSWORD: password123 + MYSQL_DATABASE: statup + +networks: + internet: + driver: bridge + database: + driver: bridge \ No newline at end of file diff --git a/source/css/base.css.map b/source/css/base.css.map deleted file mode 100644 index f42dd11c..00000000 --- a/source/css/base.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../scss/variables.scss","../scss/base.scss","../scss/mobile.scss"], -"names": [], -"file": "base.css" -} diff --git a/source/js/charts.js b/source/js/charts.js index 1ca11b32..a7a0ab87 100644 --- a/source/js/charts.js +++ b/source/js/charts.js @@ -1,3 +1,20 @@ +/* + * Statup + * Copyright (C) 2018. Hunter Long and the project contributors + * Written by Hunter Long and the project contributors + * + * https://github.com/hunterlong/statup + * + * The licenses for most software and other practical works are designed + * to take away your freedom to share and change the works. By contrast, + * the GNU General Public License is intended to guarantee your freedom to + * share and change all versions of a program--to make sure it remains free + * software for all its users. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + {{ range . }}{{$s := .ToService}}{{ if .AvgTime }}var ctx_{{$s.Id}}=document.getElementById("service_{{$s.Id}}").getContext('2d');var chartdata=new Chart(ctx_{{$s.Id}},{type:'line',data:{datasets:[{label:'Response Time (Milliseconds)',data:{{safe .GraphData}},backgroundColor:['rgba(47, 206, 30, 0.92)'],borderColor:['rgb(47, 171, 34)'],borderWidth:1}]},options:{maintainAspectRatio:!1,scaleShowValues:!0,layout:{padding:{left:0,right:0,top:0,bottom:-10}},hover:{animationDuration:0,},responsiveAnimationDuration:0,animation:{duration:3500,onComplete:function(){var chartInstance=this.chart,ctx=chartInstance.ctx;var controller=this.chart.controller;var xAxis=controller.scales['x-axis-0'];var yAxis=controller.scales['y-axis-0'];ctx.font=Chart.helpers.fontString(Chart.defaults.global.defaultFontSize,Chart.defaults.global.defaultFontStyle,Chart.defaults.global.defaultFontFamily);ctx.textAlign='center';ctx.textBaseline='bottom';var numTicks=xAxis.ticks.length;var yOffsetStart=xAxis.width/numTicks;var halfBarWidth=(xAxis.width/(numTicks*2));xAxis.ticks.forEach(function(value,index){var xOffset=20;var yOffset=(yOffsetStart*index)+halfBarWidth;ctx.fillStyle='#e2e2e2';ctx.fillText(value,yOffset,xOffset)});this.data.datasets.forEach(function(dataset,i){var meta=chartInstance.controller.getDatasetMeta(i);var hxH=0;var hyH=0;var hxL=0;var hyL=0;var highestNum=0;var lowestnum=999999999999;meta.data.forEach(function(bar,index){var data=dataset.data[index];if(lowestnum>data.y){lowestnum=data.y;hxL=bar._model.x;hyL=bar._model.y} if(data.y>highestNum){highestNum=data.y;hxH=bar._model.x;hyH=bar._model.y}});if(hxH>=820){hxH=820}else if(50>=hxH){hxH=50} if(hxL>=820){hxL=820}else if(70>=hxL){hxL=70} diff --git a/source/js/main.js b/source/js/main.js index 6f13f030..f63a403e 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -1,3 +1,20 @@ +/* + * Statup + * Copyright (C) 2018. Hunter Long and the project contributors + * Written by Hunter Long and the project contributors + * + * https://github.com/hunterlong/statup + * + * The licenses for most software and other practical works are designed + * to take away your freedom to share and change the works. By contrast, + * the GNU General Public License is intended to guarantee your freedom to + * share and change all versions of a program--to make sure it remains free + * software for all its users. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + $(".service_li").on('click', function() { var id = $(this).attr('data-id'); var position = $("#service_id_"+id).offset(); diff --git a/source/js/setup.js b/source/js/setup.js index 77792afd..3407ff3e 100644 --- a/source/js/setup.js +++ b/source/js/setup.js @@ -1,3 +1,20 @@ +/* + * Statup + * Copyright (C) 2018. Hunter Long and the project contributors + * Written by Hunter Long and the project contributors + * + * https://github.com/hunterlong/statup + * + * The licenses for most software and other practical works are designed + * to take away your freedom to share and change the works. By contrast, + * the GNU General Public License is intended to guarantee your freedom to + * share and change all versions of a program--to make sure it remains free + * software for all its users. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + var currentLocation = window.location; $("#domain_input").val(currentLocation.origin); diff --git a/core/assets.go b/source/source.go similarity index 56% rename from core/assets.go rename to source/source.go index 9452b6a5..a2283fa0 100644 --- a/core/assets.go +++ b/source/source.go @@ -1,61 +1,97 @@ -package core +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +package source import ( + "errors" "fmt" "github.com/GeertJohan/go.rice" "github.com/hunterlong/statup/utils" + "io" "io/ioutil" "os" "os/exec" ) -func RenderBoxes() { - SqlBox = rice.MustFindBox("../source/sql") - CssBox = rice.MustFindBox("../source/css") - ScssBox = rice.MustFindBox("../source/scss") - JsBox = rice.MustFindBox("../source/js") - TmplBox = rice.MustFindBox("../source/tmpl") -} +var ( + SqlBox *rice.Box + CssBox *rice.Box + ScssBox *rice.Box + JsBox *rice.Box + TmplBox *rice.Box + UsingAssets bool +) -func CopyToPublic(box *rice.Box, folder, file string) { - assetFolder := fmt.Sprintf("%v/%v", folder, file) - utils.Log(1, fmt.Sprintf("Copying %v to %v", file, assetFolder)) - base, err := box.String(file) - if err != nil { - utils.Log(3, fmt.Sprintf("Failed to copy %v to %v, %v.", file, assetFolder, err)) - } - err = ioutil.WriteFile(assetFolder, []byte(base), 0644) - if err != nil { - utils.Log(3, fmt.Sprintf("Failed to write file %v to %v, %v.", file, assetFolder, err)) - } -} - -func MakePublicFolder(folder string) { - utils.Log(1, fmt.Sprintf("Creating folder '%v'", folder)) - if _, err := os.Stat(folder); os.IsNotExist(err) { - err = os.MkdirAll(folder, 0755) - if err != nil { - utils.Log(3, fmt.Sprintf("Failed to created %v directory, %v", folder, err)) - } - } +func Assets() { + SqlBox = rice.MustFindBox("sql") + CssBox = rice.MustFindBox("css") + ScssBox = rice.MustFindBox("scss") + JsBox = rice.MustFindBox("js") + TmplBox = rice.MustFindBox("tmpl") } func CompileSASS(folder string) error { sassBin := os.Getenv("SASS") - shell := os.Getenv("CMD_FILE") + if sassBin == "" { + sassBin = "sass" + } scssFile := fmt.Sprintf("%v/%v", folder, "assets/scss/base.scss") baseFile := fmt.Sprintf("%v/%v", folder, "assets/css/base.css") utils.Log(1, fmt.Sprintf("Compiling SASS %v into %v", scssFile, baseFile)) command := fmt.Sprintf("%v %v %v", sassBin, scssFile, baseFile) - testCmd := exec.Command(shell, command) - _, err := testCmd.Output() + + utils.Log(1, fmt.Sprintf("Command: sh -c %v", command)) + + testCmd := exec.Command("sh", "-c", command) + + var stdout, stderr []byte + var errStdout, errStderr error + stdoutIn, _ := testCmd.StdoutPipe() + stderrIn, _ := testCmd.StderrPipe() + testCmd.Start() + + go func() { + stdout, errStdout = copyAndCapture(os.Stdout, stdoutIn) + }() + + go func() { + stderr, errStderr = copyAndCapture(os.Stderr, stderrIn) + }() + + err := testCmd.Wait() if err != nil { - utils.Log(3, fmt.Sprintf("Failed to compile assets with SASS %v", err)) - utils.Log(3, fmt.Sprintf("%v %v %v", sassBin, scssFile, baseFile)) + utils.Log(3, err) return err } + + if errStdout != nil || errStderr != nil { + utils.Log(3, fmt.Sprintf("Failed to compile assets with SASS %v", err)) + return errors.New("failed to capture stdout or stderr") + } + + if err != nil { + utils.Log(3, fmt.Sprintf("Failed to compile assets with SASS %v", err)) + utils.Log(3, fmt.Sprintf("bash -c %v %v %v", sassBin, scssFile, baseFile)) + return err + } + + outStr, errStr := string(stdout), string(stderr) + utils.Log(1, fmt.Sprintf("out: %v | error: %v", outStr, errStr)) utils.Log(1, "SASS Compiling is complete!") return err } @@ -83,12 +119,14 @@ func HasAssets(folder string) bool { return false } -func SaveAsset(data, folder, file string) { +func SaveAsset(data []byte, folder, file string) error { utils.Log(1, fmt.Sprintf("Saving %v/%v into assets folder", folder, file)) - err := ioutil.WriteFile(folder+"/assets/"+file, []byte(data), 0644) + err := ioutil.WriteFile(folder+"/assets/"+file, data, 0644) if err != nil { utils.Log(3, fmt.Sprintf("Failed to save %v/%v, %v", folder, file, err)) + return err } + return nil } func OpenAsset(folder, file string) string { @@ -109,6 +147,7 @@ func CreateAllAssets(folder string) error { utils.Log(1, "Inserting scss, css, and javascript files into assets folder") CopyToPublic(ScssBox, folder+"/assets/scss", "base.scss") CopyToPublic(ScssBox, folder+"/assets/scss", "variables.scss") + CopyToPublic(ScssBox, folder+"/assets/scss", "mobile.scss") CopyToPublic(CssBox, folder+"/assets/css", "bootstrap.min.css") CopyToPublic(CssBox, folder+"/assets/css", "base.css") CopyToPublic(JsBox, folder+"/assets/js", "bootstrap.min.js") @@ -117,7 +156,7 @@ func CreateAllAssets(folder string) error { CopyToPublic(JsBox, folder+"/assets/js", "main.js") CopyToPublic(JsBox, folder+"/assets/js", "setup.js") CopyToPublic(TmplBox, folder+"/assets", "robots.txt") - CopyToPublic(TmplBox, folder+"/assets", "favicon.ico") + CopyToPublic(TmplBox, folder+"/assets", "statup.png") utils.Log(1, "Compiling CSS from SCSS style...") err := utils.Log(1, "Statup assets have been inserted") return err @@ -132,3 +171,55 @@ func DeleteAllAssets(folder string) error { utils.Log(1, "Statup assets have been deleted") return err } + +func CopyToPublic(box *rice.Box, folder, file string) error { + assetFolder := fmt.Sprintf("%v/%v", folder, file) + utils.Log(1, fmt.Sprintf("Copying %v to %v", file, assetFolder)) + base, err := box.String(file) + if err != nil { + utils.Log(3, fmt.Sprintf("Failed to copy %v to %v, %v.", file, assetFolder, err)) + return err + } + err = ioutil.WriteFile(assetFolder, []byte(base), 0644) + if err != nil { + utils.Log(3, fmt.Sprintf("Failed to write file %v to %v, %v.", file, assetFolder, err)) + return err + } + return nil +} + +func MakePublicFolder(folder string) error { + utils.Log(1, fmt.Sprintf("Creating folder '%v'", folder)) + if _, err := os.Stat(folder); os.IsNotExist(err) { + err = os.MkdirAll(folder, 0755) + if err != nil { + utils.Log(3, fmt.Sprintf("Failed to created %v directory, %v", folder, err)) + return err + } + } + return nil +} + +func copyAndCapture(w io.Writer, r io.Reader) ([]byte, error) { + var out []byte + buf := make([]byte, 1024, 1024) + for { + n, err := r.Read(buf[:]) + if n > 0 { + d := buf[:n] + out = append(out, d...) + _, err := w.Write(d) + if err != nil { + return out, err + } + } + if err != nil { + // Read returns io.EOF at the end of file, which is not an error for us + if err == io.EOF { + err = nil + } + return out, err + } + } + return nil, nil +} diff --git a/source/source_test.go b/source/source_test.go new file mode 100644 index 00000000..898a02ec --- /dev/null +++ b/source/source_test.go @@ -0,0 +1,73 @@ +// Statup +// Copyright (C) 2018. Hunter Long and the project contributors +// Written by Hunter Long and the project contributors +// +// https://github.com/hunterlong/statup +// +// The licenses for most software and other practical works are designed +// to take away your freedom to share and change the works. By contrast, +// the GNU General Public License is intended to guarantee your freedom to +// share and change all versions of a program--to make sure it remains free +// software for all its users. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +package source + +import ( + "github.com/hunterlong/statup/utils" + "github.com/stretchr/testify/assert" + "os" + "testing" +) + +var ( + dir string +) + +func init() { + dir = utils.Directory + utils.InitLogs() + Assets() + os.RemoveAll(dir + "/cmd/assets") +} + +func TestCore_UsingAssets(t *testing.T) { + assert.False(t, UsingAssets) +} + +func TestCreateAssets(t *testing.T) { + assert.Nil(t, CreateAllAssets(dir)) + assert.True(t, HasAssets(dir)) + assert.FileExists(t, "../assets/css/base.css") + assert.FileExists(t, "../assets/scss/base.scss") +} + +func TestCompileSASS(t *testing.T) { + assert.Nil(t, CompileSASS(dir)) + assert.True(t, HasAssets(dir)) +} + +func TestSaveAsset(t *testing.T) { + data := []byte("BODY { color: black; }") + asset := SaveAsset(data, dir, "scss/theme.scss") + assert.Nil(t, asset) + assert.FileExists(t, dir+"/assets/scss/theme.scss") +} + +func TestOpenAsset(t *testing.T) { + asset := OpenAsset(dir, "scss/theme.scss") + assert.NotEmpty(t, asset) +} + +func TestDeleteAssets(t *testing.T) { + assert.Nil(t, DeleteAllAssets(dir)) + assert.False(t, HasAssets(dir)) +} + +func TestCopyToPluginFailed(t *testing.T) { + + assert.Nil(t, DeleteAllAssets(dir)) + assert.False(t, HasAssets(dir)) +} diff --git a/source/sql/mysql_upgrade.sql b/source/sql/mysql_upgrade.sql index 1cb44267..19dc913b 100644 --- a/source/sql/mysql_upgrade.sql +++ b/source/sql/mysql_upgrade.sql @@ -1,3 +1,5 @@ +=========================================== 1534178020 +UPDATE services SET order_id=0 WHERE order_id IS NULL; =========================================== 1532068515 ALTER TABLE services ALTER COLUMN order_id integer DEFAULT 0; ALTER TABLE services ADD COLUMN timeout integer DEFAULT 30; diff --git a/source/sql/postgres_upgrade.sql b/source/sql/postgres_upgrade.sql index 82d5cef1..b27749cf 100644 --- a/source/sql/postgres_upgrade.sql +++ b/source/sql/postgres_upgrade.sql @@ -1,3 +1,5 @@ +=========================================== 1534178020 +UPDATE services SET order_id=0 WHERE order_id IS NULL; =========================================== 1532068515 ALTER TABLE services ALTER COLUMN order_id integer DEFAULT 0; ALTER TABLE services ADD COLUMN timeout integer DEFAULT 30; diff --git a/source/sql/sqlite_upgrade.sql b/source/sql/sqlite_upgrade.sql index 420b2892..754213c2 100644 --- a/source/sql/sqlite_upgrade.sql +++ b/source/sql/sqlite_upgrade.sql @@ -1,3 +1,5 @@ +=========================================== 1534178020 +UPDATE services SET order_id=0 WHERE order_id IS NULL; =========================================== 1532068515 ALTER TABLE services ALTER COLUMN order_id integer DEFAULT 0; ALTER TABLE services ADD COLUMN timeout integer DEFAULT 30; diff --git a/source/tmpl/footer.html b/source/tmpl/footer.html index 00840732..2e4839da 100644 --- a/source/tmpl/footer.html +++ b/source/tmpl/footer.html @@ -1,8 +1,9 @@ {{ define "footer"}}
- {{ if .Core.Footer }} - {{ safe .Core.Footer }} - {{ end }} - Statup {{ VERSION }} made with ❤️ | Dashboard + {{ if CoreApp.Footer }} + {{ safe CoreApp.Footer }} + {{ else }} + Statup {{VERSION}} made with ❤️ | Dashboard + {{ end }}
{{ end }} \ No newline at end of file diff --git a/source/tmpl/login.html b/source/tmpl/login.html index c5cc1e7e..93fca9ba 100644 --- a/source/tmpl/login.html +++ b/source/tmpl/login.html @@ -19,7 +19,7 @@
-
+
{{ if .Error }}