From 1901188dc73db54a06823f290c1e6f541c3b153a Mon Sep 17 00:00:00 2001 From: Rajnish Mishra Date: Fri, 24 Dec 2021 05:27:02 +0530 Subject: [PATCH] Added a toml based config file, and the ablity to define and call commands from the config file. Added the missing LICENSE file for GPLv3, and a PKGBUILD for building the package for Arch Linux. --- Cargo.lock | 28 +- Cargo.toml | 3 +- Config.toml | 10 + LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +- package/PKGBUILD | 34 +++ rasp_mgr.service | 2 +- src/command.rs | 46 --- src/config.rs | 53 +++- src/main.rs | 62 ++-- static/commands.html | 17 +- static/exec.html | 2 +- 12 files changed, 847 insertions(+), 88 deletions(-) create mode 100644 Config.toml create mode 100644 LICENSE create mode 100644 package/PKGBUILD delete mode 100644 src/command.rs diff --git a/Cargo.lock b/Cargo.lock index 92abc4d..78f10c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -899,6 +899,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "js-sys" version = "0.3.51" @@ -931,9 +937,9 @@ checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "libmedium" -version = "0.5.5" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f6a8f301ebe547c6a400419521eda51c650687b5877540de8dadbf491921c1" +checksum = "701ed544a1ad145f1a171e15f2def7d6f537a17e2cf0957577e4129bf00a2dce" [[package]] name = "log" @@ -1211,6 +1217,7 @@ dependencies = [ "serde", "sys-info", "tide", + "toml", ] [[package]] @@ -1271,11 +1278,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" dependencies = [ - "itoa", + "itoa 1.0.1", "ryu", "serde", ] @@ -1299,7 +1306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ "form_urlencoded", - "itoa", + "itoa 0.4.7", "ryu", "serde", ] @@ -1586,6 +1593,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + [[package]] name = "typenum" version = "1.13.0" diff --git a/Cargo.toml b/Cargo.toml index b2451f0..c8ae5a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,7 @@ edition = "2018" [dependencies] clap = "2.33.3" +toml = "0.5.8" tide = "0.16.0" async-std = { version = "1.6.0", features = ["attributes"] } @@ -24,4 +25,4 @@ sys-info = "0.9.0" libc = "0.2.97" mnt = "0.3.1" -libmedium = "0.5.5" \ No newline at end of file +libmedium = "0.6.0" diff --git a/Config.toml b/Config.toml new file mode 100644 index 0000000..7996d4c --- /dev/null +++ b/Config.toml @@ -0,0 +1,10 @@ + +addr = "0.0.0.0" +port = 8080 +static_dir = "./static" + +[commands] +ipaddr = { label = "ip-addr", command = "ip addr" } +psaux = { label = "ps-aux", command = "ps -aux" } +lsblk = { label = "lsblk", command = "lsblk" } +arp = { label = "arp", command = "arp" } diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + 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. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + 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. + + + Copyright (C) + + 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: + + Copyright (C) + 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/README.md b/README.md index 0a0456c..c150e1c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Rasp Manager -A simple server manager for local newtrok. Its quite helpful when you are hosting something on raspberrypi. +A simple server manager for local network. Its quite helpful when you are hosting something on Raspberry Pi. -Feel free to add more commands in `src/command.rs`. Contributions and improvements are always welcomed. +Change `static_dir` to where static files exist add more commands in `Config.toml`. Contributions and improvements are always welcomed. Edit systemd service `rasp_mgr.service` as per your need and place it in `/usr/lib/systemd/system/` and enable it. diff --git a/package/PKGBUILD b/package/PKGBUILD new file mode 100644 index 0000000..608723b --- /dev/null +++ b/package/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Rajnish Mishra + +pkgname=raspmgr-git +_pkgname=Rasp-Manager +pkgver=1.0.0.r10.7800fc8 +pkgrel=1 +pkgdesc="A simple server manager for local network (especially for Raspberry Pi)" +arch=('any') +url="https://github.com/PiyushXCoder/${_pkgname}" +license=('GPL3') +makedepends=('git' 'cargo') +source=("git+${url}.git") +md5sums=('SKIP') + +pkgver() { + cd "${_pkgname}" + v=$(grep -R -A3 '^version =' Cargo.toml | grep 'version =' | cut -d\" -f2) + printf "$v.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + cd "${_pkgname}" + cargo build --release +} + +package() { + cd "${_pkgname}" + install -Dm755 "target/release/rasp_mgr" "${pkgdir}/usr/bin/rasp_mgr" + install -Dm644 "Config.toml" "${pkgdir}/etc/rasp_mgr/Config.toml" + install -Dm644 "rasp_mgr.service" "${pkgdir}/usr/lib/systemd/system/rasp_mgr.service" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/rasp_mgr/LICENSE" + mkdir "${pkgdir}/var/lib/rasp_mgr/" + cp -r "static" "${pkgdir}/var/lib/rasp_mgr/" +} diff --git a/rasp_mgr.service b/rasp_mgr.service index 99cc9fa..f2c1c77 100644 --- a/rasp_mgr.service +++ b/rasp_mgr.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/opt/rasp_mgr/bin/rasp_mgr --addr 0.0.0.0 --port 80 --static_dir /opt/rasp_mgr/static +ExecStart=/usr/bin/rasp_mgr --config /etc/rasp_mgr/Config.toml --addr 0.0.0.0 --port 80 --static_dir /var/lib/rasp_mgr/static LimitNOFILE=infinity [Install] diff --git a/src/command.rs b/src/command.rs deleted file mode 100644 index 9c978f0..0000000 --- a/src/command.rs +++ /dev/null @@ -1,46 +0,0 @@ -/* - This file is part of Rasp Manager. - Rasp Manager 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. - Rasp Manager 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 Rasp Manager. If not, see -*/ - -use std::process::Command; - -use tide::Request; - -fn exec(cmd: &mut Command) -> String { - let out = cmd.output(); - - if out.is_err() { - return "Failed to execute command!".to_owned(); - } - - match String::from_utf8(out.unwrap().stdout) { - Ok(out) => return out, - Err(_) => return "Request timeout".to_owned() - } -} - -pub async fn ip_addr(_: Request<()>) -> tide::Result { - Ok(exec(Command::new("ip").arg("addr")).into()) -} - -pub async fn ps(_: Request<()>) -> tide::Result { - Ok(exec(&mut Command::new("ps").arg("-aux")).into()) -} - -pub async fn lsblk(_: Request<()>) -> tide::Result { - Ok(exec(&mut Command::new("lsblk")).into()) -} - -pub async fn arp(_: Request<()>) -> tide::Result { - Ok(exec(&mut Command::new("arp")).into()) -} diff --git a/src/config.rs b/src/config.rs index 13fb88d..6983c4e 100644 --- a/src/config.rs +++ b/src/config.rs @@ -12,12 +12,26 @@ along with Rasp Manager. If not, see */ -use clap::{App, Arg}; +use std::collections::HashMap; +use serde::{Deserialize}; +use toml::from_str; +use clap::{App, Arg}; +use tide::convert::Serialize; + + +#[derive(Clone, Deserialize, Serialize)] +pub struct Command { + pub label: String, + pub command: String +} + +#[derive(Clone, Deserialize, Serialize)] pub struct Config { - pub static_dirs: Option, + pub static_dir: Option, pub addr: String, - pub port: String + pub port: i32, + pub commands: HashMap } impl Config { @@ -26,17 +40,20 @@ impl Config { .about("A simple server manager for local newtrok") .version(env!("CARGO_PKG_VERSION")) .author(env!("CARGO_PKG_AUTHORS")) + .arg(Arg::with_name("config") + .short("c") + .long("config") + .value_name("CONFIG") + .help("Config file")) .arg(Arg::with_name("addr") .short("a") .long("addr") .value_name("ADDR") - .required(true) .help("Address to listen port on")) .arg(Arg::with_name("port") .short("p") .long("port") .value_name("PORT") - .required(true) .help("Port to listen")) .arg(Arg::with_name("static_dir") .short("s") @@ -45,14 +62,32 @@ impl Config { .help("Directory to host as static")) .get_matches(); + + let config = if let Some(config) = matches.value_of("config") { + let content = std::fs::read_to_string(config).expect( + &format!("The config file doesn't exist at: {}", config) + ); + let tomlcfg: Config = from_str(&content).expect( + "The config file appears malformed!" + ); + tomlcfg + } else { + Config { + static_dir: None, + addr: "0.0.0.0".to_string(), + port: 80, + commands: HashMap::new() + } + }; Config { - static_dirs: match matches.value_of("static_dir") { + static_dir: match matches.value_of("static_dir") { Some(val) => Some(val.to_owned()), - None => None + None => config.static_dir.to_owned() }, - addr: matches.value_of("addr").unwrap().to_owned(), - port: matches.value_of("port").unwrap().to_owned() + addr: matches.value_of("addr").unwrap_or(&config.addr).to_owned(), + port: matches.value_of("port").unwrap_or_default().parse().unwrap_or(config.port), + commands: config.commands } } } diff --git a/src/main.rs b/src/main.rs index 019777f..53a8d9c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,13 +13,11 @@ use std::{path::Path, process::Command}; -use tide::prelude::*; -use tide::{Request, log::warn}; - +use config::Config; +use tide::{prelude::*, Request, Response, http::StatusCode, log::warn}; use libmedium::{parse_hwmons,sensors::{Input, Sensor}}; mod config; -mod command; mod disks; #[derive(Serialize)] @@ -59,9 +57,9 @@ async fn main() -> tide::Result<()> { let conf = config::Config::generate(); tide::log::start(); - let mut app = tide::new(); + let mut app = tide::with_state(conf.clone()); - if let Some(val) = conf.static_dirs { + if let Some(val) = conf.static_dir { let path = Path::new(&val); if path.exists() && path.is_dir() { app.at("").serve_dir(path.to_str().unwrap())?; @@ -73,21 +71,16 @@ async fn main() -> tide::Result<()> { } } + app.at("/exec/:command").get(exec_cmd); app.at("/poweroff").get(poweroff); app.at("/reboot").get(reboot); - app.at("/sysinfo").get(system_info); - - app.at("/ip_addr").get(command::ip_addr); - app.at("/ps").get(command::ps); - app.at("/lsblk").get(command::lsblk); - app.at("/arp").get(command::arp); - + app.at("/cmdquery").get(cmd_query); app.listen(format!("{}:{}", conf.addr, conf.port)).await?; Ok(()) } -async fn poweroff(_: Request<()>) -> tide::Result { +async fn poweroff(_: Request) -> tide::Result { async_std::task::spawn(async { async_std::task::sleep(std::time::Duration::from_secs(3)).await; Command::new("poweroff").spawn().expect("Failed to poweroff!"); @@ -95,7 +88,7 @@ async fn poweroff(_: Request<()>) -> tide::Result { Ok("Reqesting to poweroff. Please see green led for for activity".into()) } -async fn reboot(_: Request<()>) -> tide::Result { +async fn reboot(_: Request) -> tide::Result { async_std::task::spawn(async { async_std::task::sleep(std::time::Duration::from_secs(3)).await; Command::new("reboot").spawn().expect("Failed to reboot!"); @@ -103,7 +96,7 @@ async fn reboot(_: Request<()>) -> tide::Result { Ok("Reqesting to Rebooting.".into()) } -async fn system_info(_: Request<()>) -> tide::Result { +async fn system_info(_: Request) -> tide::Result { let os = sys_info::linux_os_release().unwrap(); let mut cpu_load_avg = 0.0; @@ -185,4 +178,39 @@ fn last_update() -> Option { return Some(s[1..s.len()-1].to_owned()); }, Err(_) => return None } -} \ No newline at end of file +} + +fn exec(cmd: &mut Command) -> String { + let out = cmd.output(); + + if out.is_err() { + return "Failed to execute command!".to_owned(); + } + + match String::from_utf8(out.unwrap().stdout) { + Ok(out) => return out, + Err(_) => return "Request timeout".to_owned() + } +} + +async fn exec_cmd(req: Request) -> tide::Result { + let cmd = req.state().commands.get( + req.param("command").map_err(|e| { + tide::log::error!("Error: {}", e); + tide::Error::from_str(StatusCode::BadRequest, "Invalid Request!") + })? + ).ok_or_else(|| { + tide::Error::from_str(StatusCode::BadRequest, "No such command!") + })?.command.as_str(); + let args: Vec<_> = cmd.split_ascii_whitespace().collect(); + Ok(exec(Command::new(&args[0]).args(&args[1..])).into()) +} + +async fn cmd_query(req: Request) -> tide::Result { + let body = tide::Body::from_json(&req.state().commands).map_err(|e| { + tide::log::error!("Error: {}", e); + tide::Error::from_str(StatusCode::ServiceUnavailable, "Internal server error!") + })?; + let res = Response::builder(StatusCode::Ok).body(body).build(); + Ok(res) +} diff --git a/static/commands.html b/static/commands.html index 0f5b9ad..7457245 100644 --- a/static/commands.html +++ b/static/commands.html @@ -21,11 +21,7 @@
General
-
    -
  • ps -aux
    • -
  • ip addr
    • -
  • lsblk
    • -
  • arp
    • +
    Power Related
      @@ -36,5 +32,16 @@ + + \ No newline at end of file diff --git a/static/exec.html b/static/exec.html index 289e9bb..0b8d675 100644 --- a/static/exec.html +++ b/static/exec.html @@ -33,7 +33,7 @@ const params = new URLSearchParams(window.location.search); var command = params.get('cmd'); if(command != '' || command != undefined) { - $.get("/"+command, function(data) { + $.get("/exec/"+command, function(data) { $('#output').empty().append($('
      ').append(data));
             }).fail(function() {
             $('#output').empty().append($('', {style: 'color: red'})