parazyd
commented
6 years ago I do not maintain it on Github.
You can clone it from git://parazyd.org/sup
Open jaromil opened 6 years ago
parazyd
commented
6 years ago I do not maintain it on Github.
You can clone it from git://parazyd.org/sup
jaromil
commented
6 years ago ...which makes me also think about moving out of github.
btw there is no git history on your repo.
parazyd
commented
6 years ago You can just delete the existing and apply the repo on top.
If you want, I can prepare a patch and email it to you.
jaromil
commented
6 years ago Yes please, send a patch. I want to preserve the history of all changes, so I'd like you to sign-off a commit. I believe your modifications can be rebased easily on current HEAD here, deleting code rather than adding.
parazyd
commented
6 years ago Sent. I attach it below as well:
From 720717bc1d76c4d3d2bfa58bf29f0e77450e8d07 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 18 Jun 2018 10:50:32 +0200
Subject: [PATCH] Codebase simplification.
This commit significantly changes the codebase to standardize and
simplify sup's functionality.
The Makefile now conforms to POSIX and forces static linking.
"u" and "g" flags have been removed. The target user is set at
compile-time through config.h
"d" flag functionality has been removed, as this can be mimicked through
the shell by backgrounding the process with '&'.
"p" flag functionality has been removed as well, as this can also be
achieved by using the shell.
The code has been relicensed to GPL-2+.
---
COPYING | 165 ----------------
LICENSE | 345 +++++++++++++++++++++++++++++++++
Makefile | 82 +++-----
README | 44 +++++
README.md | 170 -----------------
arg.h | 50 +++++
config.def.h | 46 ++---
config.mk | 7 +
sha256.c | 116 -----------
sup.1 | 63 ++----
sup.c | 529 +++++++++------------------------------------------
11 files changed, 603 insertions(+), 1014 deletions(-)
delete mode 100644 COPYING
create mode 100644 LICENSE
create mode 100644 README
delete mode 100644 README.md
create mode 100644 arg.h
create mode 100644 config.mk
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 65c5ca8..0000000
--- a/COPYING
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..460dc66
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,345 @@
+Copyright (c) 2009-2010 pancake <nopcode.org>
+Copyright (c) 2016 Denis Roio <jaromil@dyne.org>
+Copyright (c) 2018 Ivan J. <parazyd@dyne.org>
+
+Copyright (c) 2001-2003 Christophe Devine
+
+ 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.
diff --git a/Makefile b/Makefile
index 19a699c..01068a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,36 @@
-CC?=gcc
-LDD?=ld
-DESTDIR?=
-PREFIX?=/usr/local
-VERSION=1.1
-USER=root
-GROUP=root
-
-CFLAGS?=-Os -O2
-
-all: shared
-
-shared: CFLAGS+=-fPIC -fPIE -Wall
-shared: LDFLAGS=-fPIC -fPIE -pie
-shared: config.h sup.o sha256.o
- ${CC} ${LDFLAGS} sup.o sha256.o -o sup
-
-musl: musl=/usr/local/musl
-musl: CC=${musl}/bin/musl-gcc
-musl: CFLAGS+=-I${musl}/include
-musl: LDFLAGS+=-static ${musl}/lib/libc.a
-musl: config.h sup.o sha256.o
- ${CC} ${LDFLAGS} sup.o sha256.o -o sup
-
-test: CC=colorgcc
-test: CFLAGS+=--std=gnu99
-test: LDFLAGS=-lcrypto -lm
-test: config.h test.o sha256.o
- ${CC} ${LDFLAGS} test.o sha256.o -o test
-
-debug: CFLAGS+=-ggdb
-debug: sup.o
- ${CC} ${LDFLAGS} sup.o sha256.o -o sup
+# sup: scale user privileges
+# See LICENSE file for copyright and license details.
+.POSIX:
+
+include config.mk
+
+BIN = sup
+MAN = $(BIN).1
+OBJ = $(BIN:=.o) sha256.o
+
+all: $(BIN)
+
+$(OBJ): config.h config.mk
config.h:
cp config.def.h config.h
-.c.o:
- $(CC) $(CFLAGS) -c $< -o $@ -DVERSION=\"${VERSION}\"
+$(BIN): $(OBJ)
+ $(CC) $(OBJ) $(LDFLAGS) -o $@
clean:
- rm -f *.o sup test
-
-mrproper: clean
- rm -f config.h
-
-install:
- mkdir -p ${DESTDIR}${PREFIX}/bin
- cp -f sup ${DESTDIR}${PREFIX}/bin
- -chown ${USER}:${GROUP} ${DESTDIR}/${PREFIX}/bin/sup
- -chmod 4111 ${DESTDIR}${PREFIX}/bin/sup
- mkdir -p ${DESTDIR}${PREFIX}/share/man/man1
- sed s,VERSION,${VERSION}, sup.1 \
- > ${DESTDIR}${PREFIX}/share/man/man1/sup.1
-
-website: README.md
- docco -l linear -o website README.md sup.c sha256.c
- ln -sf README.html website/index.html
+ rm -f $(BIN) $(OBJ)
+
+install: all
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
+ chmod 4711 $(DESTDIR)$(PREFIX)/bin/$(BIN)
+ mkdir -p $(DESTDIR)$(MANDIR)
+ cp -f $(MAN) $(DESTDIR)$(MANDIR)
+
+uninstall:
+ rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN)
+ rm -f $(DESTDIR)$(MANDIR)/$(MAN)
+
+.c.o:
+ $(CC) $(CFLAGS) -c $<
diff --git a/README b/README
new file mode 100644
index 0000000..25bedba
--- /dev/null
+++ b/README
@@ -0,0 +1,44 @@
+sup - scale user privileges
+===========================
+sup is a small and secure tool used for privilege escalation.
+
+
+Requirements
+------------
+C99 compiler. sup is statically linked, so there are no runtime
+dependencies.
+
+
+Installation
+------------
+Edit config.mk to match your local setup (sup is installed into
+the /usr/local namespace by default).
+
+Afterwards enter the following command to build and install sup
+as root:
+
+ make clean install
+
+Further on, edit config.h and fill the correct information that
+is related to your needs. When done, just recompile and install
+sup again to make the changes effective.
+
+
+Usage
+-----
+$ sup [-l] [cmd [arg ...]]
+
+The -l flag will list authorizations that are currently found
+in the compiled binary.
+
+Other params will then execute the command if it's allowed and
+found in the rules struct found in config.h.
+
+
+Similar software
+----------------
+calife - https://www.keltia.net/programs/calife/
+doas - https://man.openbsd.org/doas
+gosu - https://github.com/tianon/gosu/
+su-exec - https://github.com/ncopa/su-exec/
+vsys - http://www.sapanbhatia.org/vsys/
diff --git a/README.md b/README.md
deleted file mode 100644
index d4fa978..0000000
--- a/README.md
+++ /dev/null
@@ -1,170 +0,0 @@
-# sup
-
-## a "small is beautiful" tool for unix privilege escalation
-
-`sup` is a very small and secure c application. it is designed to run as
-root (with suid bit on) to facilitate the privilege escalation of users
-to execute certain programs as superuser.
-
-all settings in sup are hard-coded at compile time. sup is very
-portable and self-contained, designed for production use as a static
-binary. sup is a sort of hard-coded `sudo`: it is an ideal companion
-for artisans building small containers and embedded systems.
-
-sup's new homepage is [sup.dyne.org](https://sup.dyne.org)
-
-sup code can be [read and reviewed on-line](https://sup.dyne.org/sup.html)
-
-stable releases can be downloaded from [files.dyne.org/sup](https://files.dyne.org/sup)
-
-releases are signed with the [maintainer's keys](https://keybase.io/jaromil)
-
-the develpment version of sup can be found at [git.devuan.org/jaromil/sup](https://git.devuan.org/jaromil/sup)
-
-of course there is also a [github mirror](https://github.com/dyne/sup)
-
-[](http://www.dyne.org)
-
-[origin]: https://git.devuan.org/jaromil/sup
-[m1]: https://github.com/dyne/sup
-
-## why are you whispering?
-
-as you may have realised already, sup is so minimal that all its
-documentation is written lowercase. it was originally written in 2009 by
-pancake of nopcode.org and maintained until 2011 as part of the suckless
-tools. in 2016 sup is being adopted by jaromil of dyne.org, extending
-its features to support static build with [musl-libc]() and hardcoded
-sha256 hashing of binary files.
-
-[musl-libc]: http://www.musl-libc.org/
-
-## configure
-
-sup's configuration resides in `config.h` and should be set before
-building. here below an intuitive example:
-
-```c
-// sup's configuration file
-// need sup to be re-compiled for any change to be effective
-
-/// un/comment flags below to remove functionalities
-#define HASH 1
-#define DAEMON 1
-// #define DEBUG 1
-
-#ifndef FLAGSONLY
-
-#define USER 1000
-#define GROUP -1
-
-#define SETUID 0
-#define SETGID 0
-
-#define CHROOT ""
-#define CHRDIR ""
-
-static struct rule_t rules[] = {
- // allow user to run these programs when found at a specific path location
- { USER, GROUP, "whoami", "/usr/bin/whoami", "" },
- { USER, GROUP, "ifconfig", "/sbin/ifconfig", "" },
- { USER, GROUP, "ls", "/bin/ls", "" },
- { USER, GROUP, "wifi", "/root/wifi.sh", "" },
- // allow to run id when found with matching hash anywhere in PATH
- { USER, GROUP, "id", "*", "db533b77fc9e262209a46e0f.." },
- // allow to run any program found in PATH
- { USER, GROUP, "*", "*"},
- { 0 }, // end of configuration
-};
-#endif
-```
-
-fields are organized as follows:
-
-| USER | GROUP | binary name | binary path | hash (optional) |
-
-- `USER` is the numeric id (UID) of the user authorized to execute the
- binary as superuser
-- `GROUP` is the numeric group (GID) of the user authorized to execute
- the binary as superuser (use -1 for none)
-- `binary name` is the command to run with `setuid/setgid`, e.g., `ls`
-- `binary path` is the path to the program, e.g., `/bin/ls`
-- `hash` can be computed before build using `sha256sum` (from GNU coreutils)
-
-`binary name` and `binary path` accept the wildcard character `*` to
-mean any executable, and anywhere in PATH, respectively.
-
-running `sup -l` will display the compiled-in configuration.
-
-## build
-
-sup requires a c compiler and the gnu make tool to be built.
-
-a simple `make` command will build a sup binary good enough for
-evaluation purposes, with dynamic links to the `libm` and `libc`
-libraries installed system-wide.
-
-for production use, sup should be built as a static binary: this is
-easily done by first installing `musl-libc` in its default location
-(`/usr/local/musl`) and then using the `make musl` command inside sup.
-
-## technical details
-
-sup consists of 3 files:
-
-- `sup.c` is the main source
-- `config.h` is the configuration, hardcoded at compile time
-- `sha256.c` is optional and provides the hashing functionality if
- `# define HASH 1` is set.
-
-sup is written in ansi c with posix1.b compliance for gnu/linux and
-bsd systems. it uses `setuid/gid` for privilege escalation and
-`execv()` to launch processes as superuser. daemon mode uses `fork()`
-to send processes in the background with `NOTTY` and `stdin/out/err`
-file descriptors set to `/dev/null`.
-
-## frequently asked questions
-
-### is there a package for sup?
-
-it does not make sense to have a sup package. sup is configured at
-build-time and its built binaries are specific to the task they have
-been built and set suid for. sup is a tool for people distributing
-containers, online services, embedded devices, and such.
-
-### why not use doas (openbsd)?
-
-sup is different from `doas`, because `doas` is
-[configured at runtime][doas].
-
-[doas]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man5/doas.conf.5
-
-### why not use sudo?
-
-same reason as above, `sudo` is configured at runtime.
-
-### why not use su?
-
-sup is made so that people (or scripts) don't have to type passwords
-every time they need to execute something they are entitled to execute
-as superusers. with `su` one has to type the root password every time.
-also scripts won't work without interaction.
-
-### is sup still a suckless tool?
-
-this new code hasn't been grinded by the merry folks at suckless yet,
-but pancake has acknowledged this development and, having left
-maintainance, is happy to hand it over to jaromil.
-
-## licensing
-
-sup is copyleft software licensed as gnu lesser public license
-(lgplv3). when compiled with hashing capability, its license turns into
-gnu gplv2+ because of the sha256 component.
-
-```
-sup is copyleft (c) 2009-2011 by pancake of nopcode.org
-. (c) 2016 by jaromil of dyne.org
-the fips-180-2 sha-256 implementation optionally included in sup is
-copyleft (c) 2001-2003 by christophe cevine
-```
diff --git a/arg.h b/arg.h
new file mode 100644
index 0000000..a22e019
--- /dev/null
+++ b/arg.h
@@ -0,0 +1,50 @@
+/*
+ * Copy me if you can.
+ * by 20h
+ */
+
+#ifndef ARG_H__
+#define ARG_H__
+
+extern char *argv0;
+
+/* use main(int argc, char *argv[]) */
+#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
+ argv[0] && argv[0][0] == '-'\
+ && argv[0][1];\
+ argc--, argv++) {\
+ char argc_;\
+ char **argv_;\
+ int brk_;\
+ if (argv[0][1] == '-' && argv[0][2] == '\0') {\
+ argv++;\
+ argc--;\
+ break;\
+ }\
+ int i_;\
+ for (i_ = 1, brk_ = 0, argv_ = argv;\
+ argv[0][i_] && !brk_;\
+ i_++) {\
+ if (argv_ != argv)\
+ break;\
+ argc_ = argv[0][i_];\
+ switch (argc_)
+
+#define ARGEND }\
+ }
+
+#define ARGC() argc_
+
+#define EARGF(x) ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
+ ((x), abort(), (char *)0) :\
+ (brk_ = 1, (argv[0][i_+1] != '\0')?\
+ (&argv[0][i_+1]) :\
+ (argc--, argv++, argv[0])))
+
+#define ARGF() ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
+ (char *)0 :\
+ (brk_ = 1, (argv[0][i_+1] != '\0')?\
+ (&argv[0][i_+1]) :\
+ (argc--, argv++, argv[0])))
+
+#endif
diff --git a/config.def.h b/config.def.h
index 8115419..2c2adda 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,33 +1,27 @@
-// sup's configuration file
-// need sup to be re-compiled for any change to be effective
-
-/// un/comment flags below to remove functionalities
-#define HASH 1
-#define DAEMON 1
-// #define DEBUG 1
-
-#ifndef FLAGSONLY
-
-#define USER 1000
-#define GROUP -1
+/* See LICENSE file for copyright and license details. */
+/* user and group to run as */
#define SETUID 0
#define SETGID 0
-#define CHROOT ""
-#define CHRDIR ""
-
+/* sup authorizations
+ *
+ * the format is as follows:
+ * - uid allowed to run the command (-1 means anyone)
+ * - alias/command used to call the executable
+ * - path to the executable to run
+ * - sha256 checksum of the executable
+ */
static struct rule_t rules[] = {
- // allow user to run these programs when found in path location
- { USER, GROUP, "whoami", "/usr/bin/whoami", "" },
- { USER, GROUP, "ifconfig", "/sbin/ifconfig", "" },
- { USER, GROUP, "ls", "/bin/ls", "" },
- { USER, GROUP, "wifi", "/root/wifi.sh", "" },
+ { 1000, "ls", "/bin/ls",
+ "87e8fd7d813c135875aca43a4da43d3ced41d325ed2931906444471b4e93e017" },
- // allow to run this program when found in PATH */
- { USER, GROUP, "id", "*", "db533b77fc9e262209a46e0fe5bec646c1d2ed4e33285dc61da09dbc4caf6fa6" },
- /* { USER, GROUP, "*", "*"}, // allow to run any program found in PATH */
- { 0 },
-};
+ { -1, "grep", "/bin/grep",
+ "fedeb344d1be24f4a340591cd25ed81f7e46ea12772f563c9c9f43773028e23a" },
+
+ { 1000, "tar", "/bin/tar",
+ "fedeb344d1be24f4a340591cd25ed81f7e46ea12772f563c9c9f43773028e23a" },
-#endif
+ { 1001, "test", "./a.out",
+ "254260b676a44f1529f7c855f0126a57a3fbd7ec8a74de08835f08e8e6ed21be" },
+};
diff --git a/config.mk b/config.mk
new file mode 100644
index 0000000..3eadc4f
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,7 @@
+# Install paths
+PREFIX = /usr/local
+MANDIR = $(PREFIX)/share/man/man1
+
+# Stock FLAGS
+CFLAGS = -Os -Wall -Werror -pedantic
+LDFLAGS = -static -s
diff --git a/sha256.c b/sha256.c
index c9c3069..a5a11f3 100644
--- a/sha256.c
+++ b/sha256.c
@@ -18,12 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define FLAGSONLY 1
-#include "config.h"
-// this is not compiled in if HASH is not set
-// meaning the license above doesn't applies.
-#ifdef HASH
-
#include <string.h>
#include "sha256.h"
@@ -265,113 +259,3 @@ void sha256_finish( sha256_context *ctx, uint8 digest[32] )
PUT_UINT32( ctx->state[6], digest, 24 );
PUT_UINT32( ctx->state[7], digest, 28 );
}
-
-#endif
-
-#ifdef TEST
-
-#include <stdlib.h>
-#include <stdio.h>
-
-/*
- * those are the standard FIPS-180-2 test vectors
- */
-
-static char *msg[] =
-{
- "abc",
- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
- NULL
-};
-
-static char *val[] =
-{
- "ba7816bf8f01cfea414140de5dae2223" \
- "b00361a396177a9cb410ff61f20015ad",
- "248d6a61d20638b8e5c026930c3e6039" \
- "a33ce45964ff2167f6ecedd419db06c1",
- "cdc76e5c9914fb9281a1c7e284d73e67" \
- "f1809a48a497200e046d39ccc7112cd0"
-};
-
-int main( int argc, char *argv[] )
-{
- FILE *f;
- int i, j;
- char output[65];
- sha256_context ctx;
- unsigned char buf[1000];
- unsigned char sha256sum[32];
-
- if( argc < 2 )
- {
- printf( "\n SHA-256 Validation Tests:\n\n" );
-
- for( i = 0; i < 3; i++ )
- {
- printf( " Test %d ", i + 1 );
-
- sha256_starts( &ctx );
-
- if( i < 2 )
- {
- sha256_update( &ctx, (uint8 *) msg[i],
- strlen( msg[i] ) );
- }
- else
- {
- memset( buf, 'a', 1000 );
-
- for( j = 0; j < 1000; j++ )
- {
- sha256_update( &ctx, (uint8 *) buf, 1000 );
- }
- }
-
- sha256_finish( &ctx, sha256sum );
-
- for( j = 0; j < 32; j++ )
- {
- sprintf( output + j * 2, "%02x", sha256sum[j] );
- }
-
- if( memcmp( output, val[i], 64 ) )
- {
- printf( "failed!\n" );
- return( 1 );
- }
-
- printf( "passed.\n" );
- }
-
- printf( "\n" );
- }
- else
- {
- if( ! ( f = fopen( argv[1], "rb" ) ) )
- {
- perror( "fopen" );
- return( 1 );
- }
-
- sha256_starts( &ctx );
-
- while( ( i = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
- {
- sha256_update( &ctx, buf, i );
- }
-
- sha256_finish( &ctx, sha256sum );
-
- for( j = 0; j < 32; j++ )
- {
- printf( "%02x", sha256sum[j] );
- }
-
- printf( " %s\n", argv[1] );
- }
-
- return( 0 );
-}
-
-#endif
diff --git a/sup.1 b/sup.1
index 1ea646f..827968e 100644
--- a/sup.1
+++ b/sup.1
@@ -1,49 +1,26 @@
-.TH SUP 1 sup\-1.2
+.TH SUP 1 2018-05-24
.SH NAME
-sup - a "small is beautiful" tool for UNIX privilege escalation
+sup \- scale user privileges
.SH SYNOPSIS
.B sup
-[ \fB-h -v\fR ]
-[ \fB-l\fR ]
-[ \fB-u \fIuser\fR \fB-g \fIgroup\fR ]
-[ \fB-b \fB-p \fIpidfile\fR ]
-\fBcommand\fR [ \fBargs...\fR ]
+.IR command
+[
+.IR args
+\ ... ]
+.br
+.B sup -l
+.PP
.SH DESCRIPTION
-sup is a very small and secure C application. it is designed to run as root (with suid bit on) to facilitate the privilege escalation of users to execute certain programs as superuser.
-.P
-all settings in sup are hard-coded at compile time. sup is very portable and self-contained, designed for production use as a static binary. sup is a sort of hard-coded sudo: it is an ideal companion for artisans building small containers and embedded systems.
-.SH OPTIONS
-.TP
-.B \-h
-print help message
+sup is a minimal privilege escalation utility that allows normal users
+to run other programs as different user and group. It is "secured" by
+hardcoding SHA256 sums of the executables into itself to decide if a
+user is actually authorized to run the requested command.
.TP
+The configration is done in config.h at compile time.
+.SH OPTIONS
.B \-l
-list hardcoded configuration
-.TP
-.B \-v
-print version information
-.TP
-.B \-b
-run in daemon mode: fork process to background
-.TP
-.B \-p pidfile
-when in daemon mode, save first pid to file. beware this may not be the exact final pid of the forked process: some programs are more complex and go further forking new pids.
-.TP
-.B \-u username
-username for the target uid in setuid, in case not root. looked up by getpwnam(3) in /etc/passwd.
-.TP
-.B \-g groupname
-groupname for the target gid in setuid, in case not root. looked up by getpwnam(3) in /etc/passwd.
-
-
-.SH AUTHOR
-sup is copyleft software licensed as GNU Lesser Public License
-(LGPLv3). when compiled with the HASH flag on its license turns
-into GNU GPLv2 because of the sha256 component.
-.P
-sup is copyleft (c) 2009-2011 by pancake of nopcode.org
-.BR
- (c) 2016 by jaromil of dyne.org
-.P
-the FIPS-180-2 sha-256 implementation optionally included in sup is
-copyleft (c) 2001-2003 by Christophe Devine
+list compiled authorizations
+.SH AUTHORS
+See the LICENSE file for the authors.
+.SH LICENSE
+See the LICENSE file for the terms of redistribution.
diff --git a/sup.c b/sup.c
index 7957495..fe4f152 100644
--- a/sup.c
+++ b/sup.c
@@ -1,464 +1,109 @@
-// sup 1.2
+/* See LICENSE file for copyright and license details. */
-// (c) 2016 Dyne.org Foundation, Amsterdam
-
-// Written by:
-// - 2009-2011 pancake <nopcode.org>
-// - 2016 Denis Roio <jaromil@dyne.org>
-
-// License (LGPLv3)
-// -------
-
-// This source code is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation; either version 3 of
-// the License, or (at your option) any later version.
-
-// This source code 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. Please refer
-// to the GNU Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this source code; if not, write to: Free
-// Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-// Headers
-// -------
-
-#include <errno.h>
-#include <unistd.h>
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <pwd.h>
-
-struct rule_t {
- int uid;
- int gid;
- const char *cmd;
- const char *path;
- const char *hash;
-};
-
-#include "config.h"
+#include <unistd.h>
-#ifdef HASH
+#include "arg.h"
#include "sha256.h"
-#endif
-
-// Help
-// ----
-
-static const char *HEADER = "sup " VERSION " - small and beautiful superuser tool\n";
-
-static const char *COPYLEFT =
- "copyright (C) 2016 dyne.org foundation, license GNU GPL v3+\n"
- "this is free software: you are free to change and redistribute it\n"
- "for the latest sourcecode go to <https://git.devuan.org/jaromil/sup>\n";
-
-static const char *LICENSE =
- "this source code is distributed in the hope that it will be useful,\n"
- "but without any warranty; without even the implied warranty of\n"
- "merchantability or fitness for a particular purpose.\n"
- "when in need please refer to <http://dyne.org/support>.\n";
+#define nelem(x) (sizeof (x) / sizeof *(x))
-static const char *HELP =
- "Syntax: sup [options] command [arguments...]\n"
- "\n"
- "Options:\n"
- " -l list compiled-in authorizations and flags\n"
- " -u set uid to this user name\n"
- " -g set gid to this group name\n"
- " -d fork command as background process (daemon)\n"
- " -p saves pid of background process to file (daemon)\n"
- "\n"
- "Please report bugs to <https://git.devuan.org/jaromil/sup/issues>\n";
-
-// maximum length of a command string
-#define MAXCMD 512
-// maximum length of a command full path string
-#define MAXFILEPATH 4096
+struct rule_t {
+ const int uid;
+ const char *cmd;
+ const char *path;
+ const char *hash;
+};
-// Always return 1 on error, conforming to standard shell checks.
-// Reason of error is described by stderr text before colon,
-// extended reason can be provided or falls back to errno.
-static int error(const char *code, const char *reason) {
- fprintf (stderr, "%s: %s\n",
- code? code : "",
- reason? reason : strerror (errno));
- exit(1);
-}
+#include "config.h"
-// Check if binary is found in $PATH
-// --------------------------------
+char *argv0;
-static char *getpath(const char *str) {
- struct stat st;
- static char file[MAXFILEPATH];
- char *p, *path = getenv ("PATH");
- if (path)
- for (p = path; *p; p++) {
- if (*p==':' && (p>path&&*(p-1)!='\\')) {
- *p = 0;
- snprintf (file, sizeof (file)-1, "%s/%s", path, str);
- if (!lstat (file, &st))
- return file;
- *p = ':';
- path = p+1;
- }
- }
- return NULL;
+void die(char *msg) {
+ fprintf(stderr, "%s\n", msg);
+ exit(1);
}
-// Compute SHA256 hash of binary
-// -----------------------------
-
-#ifdef HASH
-
-#define CHUNK 1048576 // 1MiB
+#define CHUNK 1048576 /* 1MiB */
static uint32 getsha(const char *path, unsigned char *dest) {
- static sha256_context sha;
-
- unsigned char buf[CHUNK]; // 1 MiB
- uint32 len, tot;
- FILE *fd;
-
- fd = fopen(path,"r");
- if(!fd) error("fopen", "cannot read binary file");
-
- sha256_starts(&sha);
- clearerr(fd);
- len=0;
- tot=0;
-
- do {
- // read chunk of data in binary file
- len = fread(buf, 1, CHUNK, fd);
- // stop if NULL read
- if(!len) break;
- tot+=len;
- // stop if EOF reached
- if(len<CHUNK) break;
+ static sha256_context sha;
- // compute sha256 of chunk
- sha256_update(&sha, buf, len);
+ unsigned char buf[CHUNK];
+ uint32 len, tot = 0;
+ FILE *fd;
- } while(len>0);
+ fd = fopen(path, "r");
+ if (!fd)
+ die("can not read binary file");
- // check file descriptor for errors
- if(ferror(fd)) {
- fclose(fd);
- error("fread", "error reading binary file");
- }
- fclose(fd);
+ sha256_starts(&sha);
- // compute last chunk
- if(len>0) sha256_update(&sha, buf, len);
+ while ((len = fread(buf, 1, CHUNK, fd))) {
+ sha256_update(&sha, buf, len);
+ tot += len;
+ }
+ fclose(fd);
- // finish and save result in *dest
- sha256_finish(&sha, dest);
-
- return(tot);
+ sha256_finish(&sha, dest);
+ return tot;
}
-#endif
-
-// Main()
-// ------
-
-int main(int argc, char **argv) {
-
- static char fullcmd[MAXCMD];
- static char *cmd;
-
- struct passwd *pw;
- struct stat st;
-
- static int i, uid, gid;
- static int target_uid=0;
- static int target_gid=0;
-
-#ifdef HASH
- unsigned char digest[32];
- char output[65];
-#endif
-
-#ifdef DAEMON
- int fork_daemon = 0;
- char pidfile[MAXFILEPATH] = "";
-#endif
-
- // parse commandline options
- int opt;
- while((opt = getopt(argc, argv, "+hvdlu:g:p:")) != -1) {
-
- switch(opt) {
-
-#ifdef DAEMON
- case 'p':
- snprintf(pidfile,MAXFILEPATH,"%s",optarg);
- break;
-#endif
-
- case 'u':
- {
- struct passwd *puid;
- errno=0;
- puid=getpwnam(optarg);
- if(!puid && errno) error("uid_getpwnam",NULL);
- if(puid) target_uid=puid->pw_uid;
- }
- break;
-
- case 'g':
- {
- struct passwd *pgid;
- errno=0;
- pgid=getpwnam(optarg);
- if(!pgid && errno) error("gid_getpwnam",NULL);
- if(pgid) target_gid=pgid->pw_gid;
- }
- break;
-
- case 'h':
- fprintf(stdout, "%s\n%s\n%s", HEADER, COPYLEFT, HELP);
- exit (0);
-
- case 'v':
- fprintf(stdout, "%s\n%s\n%s", HEADER, COPYLEFT, LICENSE);
-
- exit (0);
-
-#ifdef DAEMON
- case 'd':
- fork_daemon=1;
- break;
-#endif
-
- case 'l':
- fprintf(stdout,"%s\n%s\nList of compiled in authorizations:\n\n", HEADER, COPYLEFT);
- fprintf(stdout,"User\tUID\tGID\t%s\t\t%s\n",
- "Command","Forced PATH");
- for (i = 0; rules[i].cmd != NULL; i++) {
- // Using 'getpwuid' in statically linked applications
- // requires at runtime the shared libraries from the glibc
- // version used for linking. But not in case of musl-libc.
- pw = getpwuid( rules[i].uid );
- fprintf (stdout, "%s\t%d\t%d\t%s\t%s\n",
- pw?pw->pw_name:"", rules[i].uid, rules[i].gid,
- rules[i].cmd, rules[i].path);
-#ifdef HASH
- fprintf(stdout, "sha256: %s\n\n",rules[i].hash);
-#endif
- }
- fprintf(stdout,"\nFlags: %s %s %s %s\n",
-#ifdef HASH
- HASH?"HASH":"",
-#else
- "",
-#endif
-#ifdef DAEMON
- DAEMON?"DAEMON":"",
-#else
- "",
-#endif
- strlen(CHROOT)?"CHROOT":"",
- strlen(CHRDIR)?"CHRDIR":"");
- exit (0);
-
- } // switch(opt)
-
- } // getopt
-
- // get the called UID and GID
- uid = getuid ();
- gid = getgid ();
-
- // copy the execv argument locally
- snprintf(fullcmd,MAXCMD,"%s",argv[optind]);
- // save a pointer to basename string in cmd
- cmd = basename(fullcmd);
-
- // get the username string from /etc/passwd
- pw = getpwuid( uid );
-#ifdef DEBUG
- // one could maintain a log of calls here
- fprintf(stderr,"sup %s called by %s(%d) gid(%d)\n",
- cmd, pw?pw->pw_name:"", uid, gid);
-#endif
-
-
- // Check that all rules match
- // --------------------------
-
- // loop over each rule
- for (i = 0; rules[i].cmd != NULL; i++) {
-
- // command is * or locked path matches
- if (*rules[i].cmd == '*' || !strcmp (cmd, rules[i].cmd)) {
- // if path is locked
- if (*rules[i].path != '*') {
- // and if path is specified
- if((fullcmd[0]=='.')||(fullcmd[0]=='/')) {
- // then check that path matches
- if( strcmp(rules[i].path,fullcmd) )
- return error("path","path not matching");
- // or if path is not specified
- } else {
- // get the default path with our getpath()
- snprintf(fullcmd,MAXCMD,"%s",getpath(cmd));
- // check if the default environment path matches
- if( strcmp(rules[i].path,fullcmd) )
- return error("path","path not matching");
- }
- // or if path is not locked
- } else
- // and if path is not specified, getpath()
- if((fullcmd[0]!='.')&&(fullcmd[0]!='/'))
- snprintf(fullcmd,MAXCMD,"%s",getpath(cmd));
-
-#ifdef DEBUG
- fprintf(stderr,"path check passed\n");
- fprintf(stderr,"fullcmd: %s\n",fullcmd);
- fprintf(stderr,"cmd: %s\n",cmd);
-#endif
-
- // Command binary check
- // --------------------
-
- // command does not exist as binary on the filesystem
- if (lstat (fullcmd, &st) == -1)
- return error("lstat", "cannot stat program");
-
- if (st.st_mode & 0022)
- // command has wrong permissions (writable to others)
- return error("perm", "cannot run binaries others can write.");
-
- // user UID is not root
- if (uid != SETUID
- // and is not unlocked
- && rules[i].uid != -1
- // and is not the locked UID
- && rules[i].uid != uid)
- return error("uid", "user does not match");
-
- // user GID is not root
- if (gid != SETGID
- // and is not unlocked
- && rules[i].gid != -1
- // and is not the locked GID
- && rules[i].gid != gid)
- return error("gid", "group id does not match");
-
-
-#ifdef HASH
- // Binary hash checksum
- // --------------------
- if( strlen(rules[i].hash) ) {
- int c;
- uint32 sizeread;
-
- sizeread = getsha(fullcmd, digest);
- if(sizeread != st.st_size)
- error("getsha", "binary file size differs from size read");
-
- for(c = 0; c<32; c++)
- sprintf(output + (c * 2),"%02x",digest[c]);
- output[64] = '\0';
-
- if(strncmp(rules[i].hash, output, 64)!=0) {
- fprintf(stderr,"%s\n%s\n", rules[i].hash, output);
- return error("hash", "hash does not match");
- }
- }
-#endif
-
- // Green light to privilege escalation
- // -----------------------------------
- if (setuid (target_uid) <0)
- return error("setuid",NULL);
- if (setgid (target_gid) <0)
- return error("setgid",NULL);
- if (seteuid (target_uid) <0)
- return error("seteuid",NULL);
- if (setegid (target_gid) <0)
- return error("setegid",NULL);
-
-#ifdef CHROOT
- if (*CHROOT && (target_uid==0))
- if (chdir (CHROOT) == -1 || chroot (".") == -1)
- return error("chroot", NULL);
- if (*CHRDIR)
- if (chdir (CHRDIR) == -1)
- return error("chdir", NULL);
-#endif
-
- // Fork as daemon if desired
- // -------------------------
-
-#ifdef DAEMON
- if(fork_daemon) {
-
- pid_t pid;
- pid = fork();
- if(pid<0) return error("fork", NULL);
-
- // child
- else if(pid==0) {
-
- int fd = open("/dev/tty", O_RDWR);
- ioctl(fd, TIOCNOTTY, 0);
- close(fd);
- chdir("/");
- // secure default
- umask(022);
- // process group
- setpgid(0,0);
- // stdin
- fd=open("/dev/null", O_RDWR);
- // stdout
- dup(fd);
- // stderr
- dup(fd);
-
- // Execute in foreground
- // ---------------------
- } else {
-
- // if pidfile is not an empty string (-p is used)
- if( strncmp(pidfile,"",MAXFILEPATH) ) {
- // save the pid of the forked child. beware this
- // does not work with some daemons that follow up
- // with more forks.
- FILE *fpid = fopen(pidfile,"w");
- if(!fpid) error("pidfile", NULL);
- fprintf(fpid,"%u\n",pid);
- fclose(fpid);
- }
-
- // leave us kids alone
- _exit(0);
- }
- }
-#endif
-
- // turn current process into the execution of command
- execv (fullcmd, &argv[optind]);
- // execv returns only on errors
- error("execv", NULL);
-
- }
- }
-
- // be polite
- fprintf(stderr,"Sorry.\n");
- exit(1);
+int main(int argc, char *argv[]) {
+ unsigned int c, i, lflag = 0;
+ unsigned char digest[32];
+ char output[65];
+ struct stat st;
+
+ ARGBEGIN {
+ case 'l':
+ lflag = 1;
+ break;
+ default:
+ die("usage: sup [-l] command [ args ... ]");
+ } ARGEND;
+
+ if (lflag) {
+ printf("list of compiled authorizations:\n");
+ for (i = 0; i < nelem(rules); i++)
+ printf("\nuser: %d\ncmd: %s\nbinary: %s\nsha256: %s\n",
+ rules[i].uid, rules[i].cmd, rules[i].path, rules[i].hash);
+ exit(0);
+ }
+
+ if (argc < 1)
+ die("usage: sup [-l] [cmd [arg ...]]");
+
+ for (i = 0; i < nelem(rules); i++) {
+ if (!strcmp(argv[0], rules[i].cmd)) {
+
+ if (rules[i].uid != getuid() && rules[i].uid != -1)
+ die("unauthorized user");
+
+ if (stat(rules[i].path, &st) == -1)
+ die("can not stat program");
+
+ if (st.st_mode & 0022)
+ die("can not run binaries others can write");
+
+ if (getsha(rules[i].path, digest) != st.st_size)
+ die("binary file differs from size read");
+
+ for (c = 0; c < 32; c++)
+ sprintf(output + (c * 2), "%02x", digest[c]);
+ output[64] = '\0';
+
+ if (strncmp(rules[i].hash, output, 64))
+ die("checksums do not match");
+
+ if (setgid(SETGID) < 0) die("setgid failed");
+ if (setuid(SETUID) < 0) die("setuid failed");
+
+ if (execv(rules[i].path, argv) < 0)
+ die("execv failed");
+ }
+ }
+ die("unauthorized command");
}
--
2.17.1
Would like to merge the more recent version by @parazyd
Can you open a PR?