diff options
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | COPYING.txt | 339 | ||||
| -rw-r--r--[l---------] | Makefile | 85 | ||||
| -rw-r--r-- | common.each.head.mk | 0 | ||||
| -rw-r--r-- | common.each.tail.mk | 0 | ||||
| -rw-r--r-- | common.once.head.mk | 0 | ||||
| -rw-r--r-- | common.once.tail.mk | 0 | ||||
| -rw-r--r-- | depends_make.txt | 6 | ||||
| -rw-r--r-- | depends_static.txt | 5 | ||||
| -rwxr-xr-x | list-depends | 33 | ||||
| -rw-r--r-- | parabolaweb-changepassword.c | 114 | ||||
| -rw-r--r-- | parabolaweb-changepassword.real.in | 64 | ||||
| -rw-r--r-- | parabolaweb-reporead-inotify.in | 24 | ||||
| -rw-r--r-- | parabolaweb-reporead-inotify.service.in | 11 | ||||
| -rw-r--r-- | parabolaweb-update.in | 93 | ||||
| -rw-r--r-- | parabolaweb.conf | 10 | ||||
| -rw-r--r-- | parabolaweb.ini | 12 | ||||
| -rwxr-xr-x | write-ifchanged | 11 |
18 files changed, 815 insertions, 2 deletions
@@ -1,4 +1,12 @@ +depends.txt + +parabolaweb* +!parabolaweb*.in +!parabolaweb*.c +!parabolaweb.conf +!parabolaweb.ini + .tmp.* .var.* -/gitfiles.mk +gitfiles.mk diff --git a/COPYING.txt b/COPYING.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 2 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This 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. @@ -1 +1,84 @@ -build-aux/Makefile.README.mk
\ No newline at end of file +topoutdir ?= . +topsrcdir ?= . +include $(topsrcdir)/automake.head.mk + +PACKAGE = parabolaweb-utils +VERSION = 20160519 + +DESTDIR = + +#prefix = /usr/local +prefix = /usr +exec_prefix = $(prefix) +bindir = $(exec_prefix)/bin +#sbindir = $(exec_prefix)/sbin +sbindir = $(bindir) +#libexecdir = $(exec_prefix)/libexec +libexecdir = $(exec_prefix)/lib +#sysconfdir = $(prefix)/etc +sysconfdir = /etc/conf.d +systemddir = $(prefix)/lib/systemd/system +#uwsgidir = $(prefix)/etc/uwsgi +uwsgidir = /etc/uwsgi + +pkglibexecdir = $(libexecdir)/parabolaweb-utils +pkgconffile = $(sysconfdir)/parabolaweb + +CFLAGS += -std=c99 -Wall -Wextra -Werror -Wno-unused-parameter +CPPFLAGS += -DSCRIPT_LOCATION='"$(pkglibexecdir)/parabolaweb-changepassword.real"' + +ifeq ($(wildcard .git),) +include .srcfiles.mk +else +.srcfiles.mk: FORCE + @echo am_src_files = $(shell git ls-files) | ./write-ifchanged $@ +-include $(srcdir)/.srcfiles.mk +endif + +targets = \ + $(sbindir)/parabolaweb-changepassword \ + $(sbindir)/parabolaweb-reporead-inotify \ + $(sbindir)/parabolaweb-update \ + $(pkglibexecdir)/parabolaweb-changepassword.real \ + $(systemddir)/parabolaweb-reporead-inotify.service \ + $(uwsgidir)/parabolaweb.ini + +am_gen_files = .srcfiles.mk +am_out_files = depends.txt $(notdir $(targets)) parabolaweb.conf +am_sys_files = $(targets) $(pkgconffile) + +# Pattern rules + +%: %.in .var.sbindir .var.pkgconffile + sed -e 's|@sbindir@|$(sbindir)|' -e 's|@pkgconffile@|$(pkgconffile)|' < $< > $@ + +.var.%: FORCE + @printf '%s' '$($*)' | ./write-ifchanged $@ + +$(DESTDIR)$(sbindir)/%: % + install -Dm755 $< $@ + +$(DESTDIR)$(pkglibexecdir)/%: % + install -Dm755 $< $@ + +$(DESTDIR)$(systemddir)/%.service: %.service + install -Dm644 $< $@ + +$(DESTDIR)$(uwsgidir)/%: % + install -Dm644 $< $@ + +# Specific rules + +depends.txt: list-depends depends_static.txt + ./$< > $@ + +$(DESTDIR)$(sbindir)/parabolaweb-changepassword: parabolaweb-changepassword + install -Dm4755 $< $@ + +$(DESTDIR)$(pkgconffile): parabolaweb.conf + install -Dm644 $< $@ + +.DELETE_ON_ERROR: +.PHONY: FORCE + +include $(topsrcdir)/automake.tail.mk diff --git a/common.each.head.mk b/common.each.head.mk new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/common.each.head.mk diff --git a/common.each.tail.mk b/common.each.tail.mk new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/common.each.tail.mk diff --git a/common.once.head.mk b/common.once.head.mk new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/common.once.head.mk diff --git a/common.once.tail.mk b/common.once.tail.mk new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/common.once.tail.mk diff --git a/depends_make.txt b/depends_make.txt new file mode 100644 index 0000000..0159f05 --- /dev/null +++ b/depends_make.txt @@ -0,0 +1,6 @@ +uglify-js # for .min.js +wget +gitget +inkscape # Artwork: SVG2PNG +pngcrush # Artwork: PNGCRUSH +gsfonts # Artwork diff --git a/depends_static.txt b/depends_static.txt new file mode 100644 index 0000000..a27e211 --- /dev/null +++ b/depends_static.txt @@ -0,0 +1,5 @@ +gitget # for parabolaweb-update +librelib # for libremessages, used in parabolaweb-update +postgresql # for database +python2 # duh +uwsgi-plugin-python2 # for uwsgi diff --git a/list-depends b/list-depends new file mode 100755 index 0000000..4484be4 --- /dev/null +++ b/list-depends @@ -0,0 +1,33 @@ +#!/bin/bash + +[[ -n $stat_file ]] || stat_file='depends_static.txt' +[[ -n $prod_file ]] || prod_file='https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt' + +cat "${stat_file}" | +sed -r \ + -e 's/\s*#.*//' + +curl -s "${prod_file}" | +sed -r \ + -e 's|^-e .*/fredj/cssmin.git@master#egg=cssmin$|python2-cssmin-fredj|' \ + -e 's/.*/\L&/' \ + -e 's/^(python2?-)?/python2-/' \ + -e 's/jinja2?/jinja/' \ + -e 's/django.countries/django-countries/' | +while read -r dep; do + # This one is a little more complicated, because with == + # depends, I don't want to actually lock to that precise of a + # version; it would be a nightmare with keeping things in + # sync. So, let's turn == into >=, but also make sure the + # first two segments match. + if [[ $dep = *==* ]]; then + name="${dep%%==*}" + ver="${dep#*==}" + IFS=. + read major minor patch <<<"$ver" + echo "$name>=$ver" + echo "$name<$major.$((minor+1))" + else + echo "$dep" + fi +done diff --git a/parabolaweb-changepassword.c b/parabolaweb-changepassword.c new file mode 100644 index 0000000..96c89ed --- /dev/null +++ b/parabolaweb-changepassword.c @@ -0,0 +1,114 @@ +/* just a "stupid" secure SUID wrapper for the parabolaweb-changepassword script */ +/* Copyright (C) 2014 Luke Shumaker <lukeshu@sbcglobal.net> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#define _GNU_SOURCE /* for environment functions and asprintf(3) */ +#include <errno.h> /* for errno */ +#include <error.h> /* for error(3) */ +#include <pwd.h> /* for getpwuid(3) */ +#include <stdlib.h> /* for free(3) and environment functions */ +#include <unistd.h> /* for getuid(3), geteuid(3), setreuid(3), execl(3) */ +#include <stdio.h> /* for asprintf(3) in atoi() */ + +void +mysetenv(const char *name, const char *value) +{ + if (value != NULL) { + if (setenv(name, value, 1) != 0) { + error(127, errno, "could not set %s", name); + } + } +} + +void +xfree(void *ptr) { + if (ptr != NULL) + free(ptr); +} + +char * +itoa(long i) { + char *a = NULL; + int r = asprintf(&a, "%ld", i); + if (r < 0) { + xfree(a); + return NULL; + } + return a; +} + +void +sanitize_environment() +{ + char *a = NULL; + struct passwd *user = NULL; + + const char *env_term = getenv("TERM" ); + const char *env_lang = getenv("LANG" ); + const char *env_lc_all = getenv("LC_ALL" ); + const char *env_lc_collate = getenv("LC_COLLATE" ); + const char *env_lc_ctype = getenv("LC_CTYPE" ); + const char *env_lc_messages = getenv("LC_MESSAGES" ); + const char *env_lc_monetary = getenv("LC_MONETARY" ); + const char *env_lc_numeric = getenv("LC_NUMERIC" ); + const char *env_lc_time = getenv("LC_TIME" ); + /* NOTE: In the main program, make sure that SUID_USER is priveleged + before trusting SUDO_* */ + const char *env_sudo_user = getenv("SUDO_USER" ); + const char *env_sudo_uid = getenv("SUDO_UID" ); + const char *env_sudo_gid = getenv("SUDO_GID" ); + const char *env_sudo_command = getenv("SUDO_COMMAND"); + + clearenv(); + + mysetenv("TERM" , env_term ); + mysetenv("LANG" , env_lang ); + mysetenv("LC_ALL" , env_lc_all ); + mysetenv("LC_COLLATE" , env_lc_collate ); + mysetenv("LC_CTYPE" , env_lc_ctype ); + mysetenv("LC_MESSAGES" , env_lc_messages ); + mysetenv("LC_MONETARY" , env_lc_monetary ); + mysetenv("LC_NUMERIC" , env_lc_numeric ); + mysetenv("LC_TIME" , env_lc_time ); + mysetenv("SUDO_USER" , env_sudo_user ); + mysetenv("SUDO_UID" , env_sudo_uid ); + mysetenv("SUDO_GID" , env_sudo_gid ); + mysetenv("SUDO_COMMAND", env_sudo_command); + + user = getpwuid(getuid()); + /* similar to SUDO_* */ + mysetenv("SUID_USER", user->pw_name ); + mysetenv("SUID_UID" , a=itoa(user->pw_uid)); xfree(a); + mysetenv("SUID_GID" , a=itoa(user->pw_gid)); xfree(a); + + if (setreuid(geteuid(), -1) != 0) + error(127, errno, "setreuid"); + + user = getpwuid(geteuid()); + mysetenv("USER" , user->pw_name); + mysetenv("LOGNAME", user->pw_name); + mysetenv("HOME" , user->pw_dir ); +} + +int +main(int argc, char **argv) +{ + if (getuid() != 0) + sanitize_environment(); + + execv(SCRIPT_LOCATION, argv); + error(127, errno, "could not exec actual program: %s", SCRIPT_LOCATION); +} diff --git a/parabolaweb-changepassword.real.in b/parabolaweb-changepassword.real.in new file mode 100644 index 0000000..07499e8 --- /dev/null +++ b/parabolaweb-changepassword.real.in @@ -0,0 +1,64 @@ +#!/bin/bash -e + +# Copyright (c) 2014 Luke Shumaker <lukeshu@sbcglobal.net> +# +# 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 2 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 <http://www.gnu.org/licenses/>. + +export PATH + +usage() { + printf 'Usage: %s [USERNAME]\n' "${0##*/}" + printf 'A username may only be specified if run as root or WEBUSER.\n' +} + +main() { + . @pkgconffile@ + [[ -e "${WEBDIR}/manage.py" ]] + [[ -n "${WEBUSER}" ]] + + local REAL_USER=$USER + if ! { [[ $SUID_USER == root ]] || [[ $SUID_USER == "$WEBUSER" ]]; }; then + unset SUDO_USER SUDO_UID SUDO_GID SUDO_COMMAND + fi + + # The use-cases I want to handle: + # REAL SUID SUDO | NAME_OF others? + # user$ changepassword root user - | user no + # user$ sudo changepassword root root user | user yes + # user$ sudo -u web changepassword root web user | user yes + # web$ changepassword root web - | web yes + # root# changepassword root root - | root yes + # user$ /lib/.../changepasswoed user - - | user no + local NAME_OF=${SUDO_USER:-${SUID_USER:-$REAL_USER}} + local PERM_OF=${SUID_USER:-$REAL_USER} + + local username + if [[ $PERM_OF == root ]] || [[ $PERM_OF == "$WEBUSER" ]]; then + if [[ $# -gt 1 ]]; then + usage >&2 + return 1 + fi + username=${1:-$NAME_OF} + else + if [[ $# -gt 0 ]]; then + usage >&2 + return 1 + fi + username=$NAME_OF + fi + + sudo -u "${WEBUSER}" python2 "${WEBDIR}/manage.py" changepassword "${username}" +} + +main "$@" diff --git a/parabolaweb-reporead-inotify.in b/parabolaweb-reporead-inotify.in new file mode 100644 index 0000000..66934ea --- /dev/null +++ b/parabolaweb-reporead-inotify.in @@ -0,0 +1,24 @@ +#!/bin/bash -e + +# Copyright (c) 2012-2013 Luke Shumaker <lukeshu@sbcglobal.net> +# +# 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 2 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 <http://www.gnu.org/licenses/>. + +. @pkgconffile@ + +[[ -e "${WEBDIR}/manage.py" ]] +[[ $# -eq 0 ]] + +sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" reporead_inotify \ + "${INOTIFYARGS[@]}" diff --git a/parabolaweb-reporead-inotify.service.in b/parabolaweb-reporead-inotify.service.in new file mode 100644 index 0000000..099db8d --- /dev/null +++ b/parabolaweb-reporead-inotify.service.in @@ -0,0 +1,11 @@ +[Unit] +Requires=postgresql.service +After=postgresql.service +Description=ParabolaWeb reporead_inotify daemon + +[Service] +Type=simple +ExecStart=@sbindir@/parabolaweb-reporead-inotify + +[Install] +WantedBy=multi-user.target diff --git a/parabolaweb-update.in b/parabolaweb-update.in new file mode 100644 index 0000000..4306b8b --- /dev/null +++ b/parabolaweb-update.in @@ -0,0 +1,93 @@ +#!/bin/bash -e + +# Copyright (c) 2012-2013 Luke Shumaker <lukeshu@sbcglobal.net> +# +# 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 2 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 <http://www.gnu.org/licenses/>. + +. @pkgconffile@ +. libremessages + +clean() { + cd "$WEBDIR" + msg "Purging old .pyc files..." + find . -name '*.pyc' -delete + if $RUNMAKE &>/dev/null; then + msg "Purging old GNU Make generated files..." + make clean + fi +} + +configure() { + cd "$WEBDIR" + msg "Checking configuration..." + if [[ ! -f local_settings.py ]]; then + msg2 "Configuration file missing, opening editor..." + cp local_settings.py.example local_settings.tmp.$$.py + if "$EDITOR" local_settings.tmp.$$.py; then + mv local_settings.tmp.$$.py local_settings.py + else + rm local_settings.tmp.$$.py + msg "Failed to configure, exiting" + exit 1 + fi + msg2 "Creating database..." + ./manage.py syncdb + else + msg2 "Current configuration checks out" + fi +} + +update-database() { + cd "$WEBDIR" + msg "Updating database..." + msg2 "Running migrations..." + ./manage.py migrate + if [[ -f devel/management/commands/update_types_permissions.py ]]; then + msg2 "Updating permissions..." + ./manage.py update_types_permissions + fi + msg2 "Loading fixtures..." + ./manage.py loaddata main/fixtures/*.json + ./manage.py loaddata devel/fixtures/*.json + ./manage.py loaddata mirrors/fixtures/*.json + ./manage.py loaddata releng/fixtures/*.json +} + +update-filesystem() { + cd "$WEBDIR" + msg "Updating filesystem..." + if $RUNMAKE &>/dev/null; then + msg2 "Re-creating GNU Make generated files..." + make + fi + msg2 "Collecting static files..." + echo yes | ./manage.py collectstatic -l +} + +main() { + if [[ -z "$EDITOR" ]]; then + error 'Please set the $EDITOR variable' + exit 1 + fi + + if [[ -d "$WEBDIR" ]]; then + clean + fi + gitget checkout "$GITURL" "$WEBDIR" + configure + update-database + update-filesystem +} + +main "$@" diff --git a/parabolaweb.conf b/parabolaweb.conf new file mode 100644 index 0000000..07952a9 --- /dev/null +++ b/parabolaweb.conf @@ -0,0 +1,10 @@ +# If you change `WEBUSER` or `WEBDIR`, you should also change +# `/etc/uwsgi/parabolaweb.ini`. +WEBUSER=parabolaweb +WEBDIR=/srv/http/www.parabola.nu/web + +GITURL='git://projects.parabola.nu/parabolaweb.git#branch=master' + +RUNMAKE='pacman -Q parabolaweb-dev' + +INOTIFYARGS=('/srv/repo/main/%(repo)s/os/%(arch)s/') diff --git a/parabolaweb.ini b/parabolaweb.ini new file mode 100644 index 0000000..d170279 --- /dev/null +++ b/parabolaweb.ini @@ -0,0 +1,12 @@ +[uwsgi] +master = true +processes = 4 + +# If you change `uid` or `wsgi-file`, you should also change +# `/etc/conf.d/parabolaweb`. + +uid = %n +gid = http + +plugins = python2 +wsgi-file = /srv/http/www.parabola.nu/web/archweb.wsgi diff --git a/write-ifchanged b/write-ifchanged new file mode 100755 index 0000000..c65fa16 --- /dev/null +++ b/write-ifchanged @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +outfile=$1 +tmpfile="$(dirname "$outfile")/.tmp${outfile##*/}" + +cat > "$tmpfile" || exit $? +if cmp -s "$tmpfile" "$outfile"; then + rm -f "$tmpfile" || : +else + mv -f "$tmpfile" "$outfile" +fi |