[X2Go-Commits] [libpam-x2go] 01/01: Code project moved permanently into Arctica Project's realm.
git-admin at x2go.org
git-admin at x2go.org
Wed Nov 11 16:26:32 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository libpam-x2go.
commit 5bce91add3ffb023060253459c212f0a4f205918
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Nov 11 16:26:22 2015 +0100
Code project moved permanently into Arctica Project's realm.
---
.bzrignore | 7 -
.gitignore | 7 -
AUTHORS | 1 -
COPYING | 674 --------------------------------------------
ChangeLog | 1 -
Makefile.am | 36 ---
Makefile.am.coverage | 48 ----
NEWS | 1 -
README | 1 -
README.discontinued | 5 +
autogen.sh | 9 -
configure.ac | 82 ------
debian/changelog | 43 ---
debian/compat | 1 -
debian/control | 30 --
debian/copyright | 30 --
debian/rules | 11 -
debian/source/format | 1 -
debian/watch | 2 -
m4/gcov.m4 | 86 ------
m4/gtest.m4 | 63 -----
src/Makefile.am | 34 ---
src/auth-check-path.c | 2 -
src/auth-check-path.h | 1 -
src/pam-x2go-children.c | 233 ---------------
src/pam-x2go-children.h | 31 --
src/pam-x2go.c | 431 ----------------------------
src/x2go-auth-check.c | 90 ------
tests/Makefile.am | 67 -----
tests/mock_guest.c | 124 --------
tests/mock_guest.h | 28 --
tests/mock_pam.c | 112 --------
tests/mock_pam.h | 25 --
tests/test-x2go-auth.c | 59 ----
tests/test-x2go-wrapper.cc | 80 ------
35 files changed, 5 insertions(+), 2451 deletions(-)
diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 84cea41..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1,7 +0,0 @@
-libpam-x2go-[0-9].[0-9].[0-9].tar.gz
-libpam-x2go-[0-9].[0-9].[0-9].tar.gz.asc
-src/pam_x2go.la
-src/pam_x2go_la-pam-x2go.lo
-src/pam_x2go_la-pam-x2go.o
-src/pam-x2go.la
-x2go-auth-check
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 84cea41..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-libpam-x2go-[0-9].[0-9].[0-9].tar.gz
-libpam-x2go-[0-9].[0-9].[0-9].tar.gz.asc
-src/pam_x2go.la
-src/pam_x2go_la-pam-x2go.lo
-src/pam_x2go_la-pam-x2go.o
-src/pam-x2go.la
-x2go-auth-check
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 0af8cba..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-# Generated by Makefile
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU 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.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <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 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/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 0af8cba..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-# Generated by Makefile
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 7d71690..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-
-SUBDIRS = src
-
-if HAVE_GTEST
-SUBDIRS += tests
-endif
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
-
-dist-hook:
- @if test -d "$(top_srcdir)/.bzr"; \
- then \
- echo Creating ChangeLog && \
- ( cd "$(top_srcdir)" && \
- echo '# Generated by Makefile. Do not edit.'; echo; \
- $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
- && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
- || (rm -f ChangeLog.tmp; \
- echo Failed to generate ChangeLog >&2 ); \
- else \
- echo Failed to generate ChangeLog: not a branch >&2; \
- fi
- @if test -d "$(top_srcdir)/.bzr"; \
- then \
- echo Creating AUTHORS && \
- ( cd "$(top_srcdir)" && \
- echo '# Generated by Makefile. Do not edit.'; echo; \
- $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
- && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
- || (rm -f AUTHORS.tmp; \
- echo Failed to generate AUTHORS >&2 ); \
- else \
- echo Failed to generate AUTHORS: not a branch >&2; \
- fi
-
-include $(top_srcdir)/Makefile.am.coverage
diff --git a/Makefile.am.coverage b/Makefile.am.coverage
deleted file mode 100644
index fb97747..0000000
--- a/Makefile.am.coverage
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# Coverage targets
-
-.PHONY: clean-gcno clean-gcda \
- coverage-html generate-coverage-html clean-coverage-html \
- coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
-
-if HAVE_GCOV
-
-clean-gcno:
- @echo Removing old coverage instrumentation
- -find -name '*.gcno' -print | xargs -r rm
-
-clean-gcda:
- @echo Removing old coverage results
- -find -name '*.gcda' -print | xargs -r rm
-
-coverage-html: clean-gcda
- -$(MAKE) $(AM_MAKEFLAGS) -k check
- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-
-generate-coverage-html:
- @echo Collecting coverage data
- $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
- LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-
-clean-coverage-html: clean-gcda
- -$(LCOV) --directory $(top_builddir) -z
- -rm -rf coverage.info coveragereport
-
-if HAVE_GCOVR
-
-coverage-gcovr: clean-gcda
- -$(MAKE) $(AM_MAKEFLAGS) -k check
- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-
-generate-coverage-gcovr:
- @echo Generating coverage GCOVR report
- $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-
-clean-coverage-gcovr: clean-gcda
- -rm -rf $(top_builddir)/coverage.xml
-
-endif # HAVE_GCOVR
-
-endif # HAVE_GCOV
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 8669d35..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-No NEWS is good NEWS
diff --git a/README b/README
deleted file mode 100644
index e77de8c..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-A small PAM module to check an X2Go Server (SSH) for credentials
diff --git a/README.discontinued b/README.discontinued
new file mode 100644
index 0000000..e9968ea
--- /dev/null
+++ b/README.discontinued
@@ -0,0 +1,5 @@
+This project has been moved to the Arctica Project's Git repository:
+
+https://github.com/ArcticaProject/libpam-x2go
+
+20151111, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 5164b66..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-which gnome-autogen.sh || {
- echo "Could not find 'gnome-autgen.sh'. Is gnome-common installed?"
- exit 1
-}
-
-. gnome-autogen.sh
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index ba57d72..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,82 +0,0 @@
-AC_INIT([libpam-x2go], [0.0.1.1])
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([-Wno-portability])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_PROG_CC
-# the Google Test targets are cpp
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-LT_INIT([disable-static])
-
-###########################
-# PAM
-###########################
-
-have_pam=no
-AC_CHECK_LIB(pam, pam_getenv, have_pam=yes)
-if test "x$have_pam" = "xno"; then
- AC_MSG_ERROR([Required library PAM was not found])
-fi
-
-###########################
-# LIBSSH
-###########################
-
-PKG_CHECK_MODULES(LIBSSH, libssh)
-
-###########################
-# Local Install
-###########################
-
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall],
- [install all files locally (for distcheck)]),
- with_localinstall=$enableval,
- with_localinstall=no)
-
-###########################
-# PAM Module dir
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
- PAMMODULEDIR="${libdir}/security/"
-else
- PAMMODULEDIR="/lib/security"
-fi
-AC_SUBST(PAMMODULEDIR)
-
-###########################
-# Google Test Dependencies
-###########################
-
-m4_include([m4/gtest.m4])
-CHECK_GTEST
-if test "x$have_gtest" != "xyes"; then
- AC_MSG_WARN([tests were requested but gtest is not installed.])
-fi
-AM_CONDITIONAL([HAVE_GTEST], [test "$have_gtest" != "no"])
-
-###########################
-# gcov coverage reporting
-###########################
-
-m4_include([m4/gcov.m4])
-AC_TDD_GCOV
-AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
-AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
-AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
-AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_CXXFLAGS)
-AC_SUBST(COVERAGE_LDFLAGS)
-
-
-
-AC_CONFIG_FILES([
- Makefile
- src/Makefile
- tests/Makefile
-])
-AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 9fe5392..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,43 +0,0 @@
-libpam-x2go (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
-
- [ Jan Engelhardt ]
- * New upstream version (0.0.1.1):
- - Make building tests optional. (Fixes: #196).
-
- [ Mike Gabriel ]
- * debian/source/format:
- + Switch to format 1.0.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 30 Apr 2013 17:40:29 +0200
-
-libpam-x2go (0.0.1.0-0~x2go1) unstable; urgency=low
-
- * New upstream version (0.0.1.0):
- - Adapt to changes in lightdm-remote-login-x2go (0.0.1.0). Expect
- a UCCS service that supports session type »x2go».
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 27 Apr 2013 13:44:14 +0200
-
-libpam-x2go (0.0.0.2-0~x2go1) unstable; urgency=low
-
- [ Jan Engelhardt ]
- * New upstream version (0.0.0.2):
- - Continue to run even in the absence of AM_SILENT_RULES.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 24 Apr 2013 18:30:22 +0200
-
-libpam-x2go (0.0.0.1-0~x2go1) unstable; urgency=low
-
- * Initial upstream release. Forked from libpam-freerdp (by Ted Gould
- <ted at canonical.com>).
- * Adaptations of the forked original to work with X2Go:
- - Check the authentication token via libssh (ssh login to the remote
- server).
- - Set PAM_SM_AUTH and PAM_SM_SESSION before including
- security/pam_modules.h.
- * /debian/rules:
- - Override auto_build with our own automake mechanism.
- * /debian/control:
- - Depend on dh-autoreconf.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 10 Nov 2012 22:21:10 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 907cd60..0000000
--- a/debian/control
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: libpam-x2go
-Section: misc
-Priority: extra
-Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
-Uploaders:
- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Build-Depends:
- debhelper (>= 9),
- libgtest-dev,
- libpam0g-dev,
- libssh-dev,
- pkg-config,
- cdbs (>= 0.4.93~),
- dh-autoreconf,
-Standards-Version: 3.9.4
-Homepage: http://wiki.x2go.org
-Vcs-Git: git://code.x2go.org/libpam-x2go.git
-Vcs-Browser: http://code.x2go.org/gitweb?p=libpam-x2go.git;a=summary
-
-Package: libpam-x2go
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Suggests:
- x2goclient | pyhoca-cli,
-Description: PAM Module to auth against an X2Go server using PyHoca
- Auth and session PAM module that uses SSH to authenticate against
- an X2Go server as the remote host and user. Local account required.
- Most useful with the pam-temp-account module.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 80ffaba..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,30 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libpam-x2go
-Source: http://code.x2go.org/gitweb?p=libpam-x2go.git;a=summary
-
-Files: *
-Copyright:
- 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel at das-netzwerkteam.de>
- 2012, Canonical Ltd.
-License: GPL-3
-
-Files: debian/*
-Copyright:
- 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel at das-netzwerkteam.de>
-License: GPL-3
-
-License: GPL-3
- This package 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; version 3 of the License.
- .
- This package 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/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 637ae1e..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-# Remove .a and .la files from /lib/security
-binary-post-install/libpam-x2go::
- find $(DEB_DESTDIR)/lib/security -type f \
- \( -name '*.a' -o -name '*.la' \) \
- -exec rm '{}' +
\ No newline at end of file
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index d3827e7..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 282ce0a..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://code.x2go.org/releases/source/libpam-x2go/libpam-x2go-(.+)\.tar\.gz
diff --git a/m4/gcov.m4 b/m4/gcov.m4
deleted file mode 100644
index 3163584..0000000
--- a/m4/gcov.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-# Checks for existence of coverage tools:
-# * gcov
-# * lcov
-# * genhtml
-# * gcovr
-#
-# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
-AC_DEFUN([AC_TDD_GCOV],
-[
- AC_ARG_ENABLE(gcov,
- AS_HELP_STRING([--enable-gcov],
- [enable coverage testing with gcov]),
- [use_gcov=$enableval], [use_gcov=no])
-
- if test "x$use_gcov" = "xyes"; then
- # we need gcc:
- if test "$GCC" != "yes"; then
- AC_MSG_ERROR([GCC is required for --enable-gcov])
- fi
-
- # Check if ccache is being used
- AC_CHECK_PROG(SHTOOL, shtool, shtool)
- case `$SHTOOL path $CC` in
- *ccache*[)] gcc_ccache=yes;;
- *[)] gcc_ccache=no;;
- esac
-
- if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
- AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
- fi
-
- lcov_version_list="1.6 1.7 1.8 1.9"
- AC_CHECK_PROG(LCOV, lcov, lcov)
- AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
- if test "$LCOV"; then
- AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
- glib_cv_lcov_version=invalid
- lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
- for lcov_check_version in $lcov_version_list; do
- if test "$lcov_version" = "$lcov_check_version"; then
- glib_cv_lcov_version="$lcov_check_version (ok)"
- fi
- done
- ])
- else
- lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
- AC_MSG_ERROR([$lcov_msg])
- fi
-
- case $glib_cv_lcov_version in
- ""|invalid[)]
- lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
- AC_MSG_ERROR([$lcov_msg])
- LCOV="exit 0;"
- ;;
- esac
-
- if test -z "$GENHTML"; then
- AC_MSG_ERROR([Could not find genhtml from the lcov package])
- fi
-
- ac_cv_check_gcov=yes
- ac_cv_check_lcov=yes
-
- # Remove all optimization flags from CFLAGS
- changequote({,})
- CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
- changequote([,])
-
- # Add the special gcc flags
- COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
- COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
- COVERAGE_LDFLAGS="-lgcov"
-
- # Check availability of gcovr
- AC_CHECK_PROG(GCOVR, gcovr, gcovr)
- if test -z "$GCOVR"; then
- ac_cv_check_gcovr=no
- else
- ac_cv_check_gcovr=yes
- fi
-
-fi
-]) # AC_TDD_GCOV
diff --git a/m4/gtest.m4 b/m4/gtest.m4
deleted file mode 100644
index 2de334c..0000000
--- a/m4/gtest.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) 2012 Canonical, Ltd.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Checks whether the gtest source is available on the system. Allows for
-# adjusting the include and source path. Sets have_gtest=yes if the source is
-# present. Sets GTEST_CPPFLAGS and GTEST_SOURCE to the preprocessor flags and
-# source location respectively.
-AC_DEFUN([CHECK_GTEST],
-[
- AC_ARG_WITH([gtest-include-path],
- [AS_HELP_STRING([--with-gtest-include-path],
- [location of the Google test headers])],
- [GTEST_CPPFLAGS="-I$withval"])
-
- AC_ARG_WITH([gtest-source-path],
- [AS_HELP_STRING([--with-gtest-source-path],
- [location of the Google test sources, defaults to /usr/src/gtest])],
- [GTEST_SOURCE="$withval"],
- [GTEST_SOURCE="/usr/src/gtest"])
-
- GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE"
-
- AC_LANG_PUSH([C++])
-
- tmp_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS"
-
- AC_CHECK_HEADER([gtest/gtest.h])
-
- CPPFLAGS="$tmp_CPPFLAGS"
-
- AC_LANG_POP
-
- AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
- [$GTEST_SOURCE/src/gtest_main.cc],
- [have_gtest_source=yes],
- [have_gtest_source=no])
-
- AS_IF([test "x$ac_cv_header_gtest_gtest_h" = xyes -a \
- "x$have_gtest_source" = xyes],
- [have_gtest=yes]
- [AC_SUBST(GTEST_CPPFLAGS)]
- [AC_SUBST(GTEST_SOURCE)],
- [have_gtest=no])
-]) # CHECK_GTEST
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index e09c057..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-pamlibdir = $(PAMMODULEDIR)
-pamlib_LTLIBRARIES = pam_x2go.la
-
-pam_x2go_la_SOURCES = \
- auth-check-path.c auth-check-path.h \
- pam-x2go.c \
- pam-x2go-children.c
-
-pam_x2go_la_LDFLAGS = \
- -no-undefined \
- -module \
- -avoid-version \
- $(COVERAGE_LDFLAGS)
-
-pam_x2go_la_CFLAGS = \
- -Wall -Werror \
- -DAUTH_CHECK="\"$(libexecdir)/x2go-auth-check\"" \
- $(COVERAGE_CFLAGS)
-
-pam_x2go_la_LIBADD = \
- -lpam
-
-libexec_PROGRAMS = \
- x2go-auth-check
-
-x2go_auth_check_SOURCES = \
- x2go-auth-check.c
-x2go_auth_check_CFLAGS = \
- $(LIBSSH_CFLAGS) \
- $(COVERAGE_CFLAGS)
-x2go_auth_check_LDADD = \
- $(LIBSSH_LIBS)
-x2go_auth_check_LDFLAGS = \
- $(COVERAGE_LDFLAGS)
diff --git a/src/auth-check-path.c b/src/auth-check-path.c
deleted file mode 100644
index 4ba7de6..0000000
--- a/src/auth-check-path.c
+++ /dev/null
@@ -1,2 +0,0 @@
-const char * auth_check_path = AUTH_CHECK;
-
diff --git a/src/auth-check-path.h b/src/auth-check-path.h
deleted file mode 100644
index 82deca2..0000000
--- a/src/auth-check-path.h
+++ /dev/null
@@ -1 +0,0 @@
-extern const char * auth_check_path;
diff --git a/src/pam-x2go-children.c b/src/pam-x2go-children.c
deleted file mode 100644
index d719a53..0000000
--- a/src/pam-x2go-children.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- * Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Author libpam-freerdp (where we forked from): Ted Gould <ted at canonical.com>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/un.h>
-#include <pwd.h>
-#include <grp.h>
-#include <errno.h>
-
-#include <security/pam_modules.h>
-#include <security/pam_modutil.h>
-#include <security/pam_appl.h>
-
-#include "pam-x2go-children.h"
-#include "auth-check-path.h"
-
-void
-pam_sm_authenticate_helper (int *stdinpipe, const char* username, const char* rhost, const char* ruser, const char* rsession)
-{
-
- dup2(stdinpipe[0], 0);
-
- char * args[5];
-
- args[0] = (char *)auth_check_path;
- args[1] = (char *)rhost;
- args[2] = (char *)ruser;
- args[3] = (char *)rsession;
- args[4] = NULL;
-
- struct passwd * pwdent = getpwnam(username);
- if (pwdent == NULL) {
- _exit(EXIT_FAILURE);
- }
-
- /* Setting groups, but allowing EPERM as if we're not 100% root
- we might not be able to do this */
- if (setgroups(1, &pwdent->pw_gid) != 0 && errno != EPERM) {
- _exit(EXIT_FAILURE);
- }
-
- if (setgid(pwdent->pw_gid) < 0 || setuid(pwdent->pw_uid) < 0 ||
- setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) {
- _exit(EXIT_FAILURE);
- }
-
- if (clearenv() != 0) {
- _exit(EXIT_FAILURE);
- }
-
- if (chdir(pwdent->pw_dir) != 0) {
- _exit(EXIT_FAILURE);
- }
-
- setenv("HOME", pwdent->pw_dir, 1);
-
- execvp(args[0], args);
- _exit(0);
-}
-
-int
-session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruser, const char * rhost, const char * rsession, const char * password)
-{
- /* Socket stuff */
- int socketfd = 0;
- struct sockaddr_un socket_addr;
-
- /* Connected user */
- socklen_t connected_addr_size;
- int connectfd = 0;
- struct sockaddr_un connected_addr;
-
- /* Our buffer */
- char * buffer = NULL;
- int buffer_len = 0;
- int buffer_fill = 0;
-
- /* Track write out */
- int writedata = 0;
-
- /* Track ready writing */
- int readywrite = 0;
-
- /* Setting groups, but allowing EPERM as if we're not 100% root
- we might not be able to do this */
- if (setgroups(1, &pwdent->pw_gid) != 0 && errno != EPERM) {
- _exit(EXIT_FAILURE);
- }
-
- if (setgid(pwdent->pw_gid) < 0 || setuid(pwdent->pw_uid) < 0 ||
- setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) {
- /* Don't need to clean up yet */
- return EXIT_FAILURE;
- }
-
- if (clearenv() != 0) {
- /* Don't need to clean up yet */
- return EXIT_FAILURE;
- }
-
- if (chdir(pwdent->pw_dir) != 0) {
- /* Don't need to clean up yet */
- return EXIT_FAILURE;
- }
-
- if (rsession[0] == '\0') {
- rsession = "TERMINAL";
- }
-
- /* Build this up as a buffer so we can just write it and see that
- very, very clearly */
- buffer_len += strlen(ruser) + 1; /* Add one for the space */
- buffer_len += strlen(rhost) + 1; /* Add one for the space */
- buffer_len += strlen(rsession) + 1; /* Add one for the space */
- buffer_len += strlen(password) + 1; /* Add one for the NULL */
-
- if (buffer_len < 5) {
- /* Don't need to clean up yet */
- return EXIT_FAILURE;
- }
-
- buffer = malloc(buffer_len);
-
- if (buffer == NULL) {
- /* Don't need to clean up yet */
- return EXIT_FAILURE;
- }
-
- /* Lock the buffer before writing */
- if (mlock(buffer, buffer_len) != 0) {
- /* We can't lock, we go home */
- goto cleanup;
- }
-
- buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s", ruser, rhost, rsession, password);
- if (buffer_fill > buffer_len) {
- /* This really shouldn't happen, but if for some reason we have an
- difference between they way that the lengths are calculated we want
- to catch that. */
- goto cleanup;
- }
-
- /* Make our socket and bind it */
- socketfd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (socketfd < 0) {
- goto cleanup;
- }
-
- memset(&socket_addr, 0, sizeof(struct sockaddr_un));
- socket_addr.sun_family = AF_UNIX;
- strncpy(socket_addr.sun_path, pwdent->pw_dir, sizeof(socket_addr.sun_path) - 1);
- strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.x2go-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1);
-
- /* We bind the socket before forking so that we ensure that
- there isn't a race condition to get to it. Things will block
- otherwise. */
- if (bind(socketfd, (struct sockaddr *)&socket_addr, sizeof(struct sockaddr_un)) < 0) {
- goto cleanup;
- }
-
- /* Set the socket file permissions to be 600 and the user and group
- to be the guest user. NOTE: This won't protect on BSD */
- if (chmod(socket_addr.sun_path, S_IRUSR | S_IWUSR) != 0 ||
- chown(socket_addr.sun_path, pwdent->pw_uid, pwdent->pw_gid) != 0) {
- goto cleanup;
- }
-
- if (listen(socketfd, 1) < 0) {
- goto cleanup;
- }
-
- readywrite = write(readypipe, ALL_GOOD_SIGNAL, strlen(ALL_GOOD_SIGNAL) + 1);
- if (readywrite != strlen(ALL_GOOD_SIGNAL) + 1) {
- goto cleanup;
- }
-
- connected_addr_size = sizeof(struct sockaddr_un);
- connectfd = accept(socketfd, (struct sockaddr *)&connected_addr, &connected_addr_size);
- if (connectfd < 0) {
- goto cleanup;
- }
-
- writedata = write(connectfd, buffer, buffer_len);
-
-cleanup:
- if (socketfd != 0) {
- close(socketfd);
- }
- if (connectfd != 0) {
- close(connectfd);
- }
-
- if (buffer != NULL) {
- memset(buffer, 0, buffer_len);
- munlock(buffer, buffer_len);
- free(buffer);
- buffer = NULL;
- }
-
- /* This should be only true on the write, so we can use this to check
- out as writedata is init to 0 */
- if (writedata == buffer_len) {
- _exit (0);
- }
-
- _exit(EXIT_FAILURE);
-}
-
diff --git a/src/pam-x2go-children.h b/src/pam-x2go-children.h
deleted file mode 100644
index f46c3cf..0000000
--- a/src/pam-x2go-children.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- * Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- */
-
-#ifndef _PAM_X2GO_CHILDREN_H_
-#define _PAM_X2GO_CHILDREN_H_
-
-#define PAM_TYPE_SESSIONTYPE 1234
-#define ALL_GOOD_SIGNAL "Ar, ready to authenticate cap'n"
-
-void
-pam_sm_authenticate_helper (int *stdinpipe, const char* username, const char* rhost, const char* ruser, const char* rsession);
-
-int
-session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruser, const char * rhost, const char * rsession, const char * password);
-#endif //_PAM_X2GO_CHILDREN_H_
diff --git a/src/pam-x2go.c b/src/pam-x2go.c
deleted file mode 100644
index 0ed8a6b..0000000
--- a/src/pam-x2go.c
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- * Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Author libpam-freerdp (where we forked from): Ted Gould <ted at canonical.com>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/un.h>
-#include <pwd.h>
-#include <grp.h>
-#include <errno.h>
-
-#define PAM_SM_AUTH
-#define PAM_SM_SESSION
-#include <security/pam_modules.h>
-#include <security/pam_modutil.h>
-#include <security/pam_appl.h>
-
-#include "pam-x2go-children.h"
-#include "auth-check-path.h"
-
-static int unpriveleged_kill (struct passwd * pwdent);
-
-static char * global_session = NULL;
-/* FIXME? This is a work around to the fact that PAM seems to be clearing
- the auth token between authorize and open_session. Which then requires
- us to save it. Seems like we're the wrong people to do it, but we have
- no choice */
-static char * global_password = NULL;
-
-/* Either grab a value or prompt for it */
-static char *
-get_item (pam_handle_t * pamh, int type)
-{
- /* Check to see if we just have the value. If we do, great
- let's dup it some we're consistently allocating memory */
- if (type != PAM_TYPE_SESSIONTYPE) {
- /* If it's not a session type we can use the PAM functions because the PAM
- functions don't support session type */
- char * value = NULL;
- if (pam_get_item(pamh, type, (const void **)&value) == PAM_SUCCESS && value != NULL) {
- return value;
- }
- if (type == PAM_AUTHTOK && global_password != NULL) {
- /* If we're looking for a password, we didn't get one, before
- prompting see if we've got a global one. */
- return global_password;
- }
- } else {
- /* Here we only have session type, so we can see if the global session type is
- useful for us, if we have it */
- if (global_session != NULL) {
- return global_session;
- }
- }
- /* Now we need to prompt */
-
- /* Build up the message we're prompting for */
- struct pam_message message;
- const struct pam_message * pmessage = &message;
-
- message.msg = NULL;
- message.msg_style = PAM_PROMPT_ECHO_ON;
-
- switch (type) {
- case PAM_USER:
- message.msg = "login:";
- break;
- case PAM_RUSER:
- message.msg = "remote login:";
- break;
- case PAM_RHOST:
- message.msg = "remote host:";
- break;
- case PAM_AUTHTOK:
- message.msg = "password:";
- message.msg_style = PAM_PROMPT_ECHO_OFF;
- break;
- case PAM_TYPE_SESSIONTYPE:
- message.msg = "x2gosession:";
- break;
- default:
- return NULL;
- }
-
- struct pam_conv * conv = NULL;
- if (pam_get_item(pamh, PAM_CONV, (const void **)&conv) != PAM_SUCCESS || conv == NULL || conv->conv == NULL) {
- return NULL;
- }
-
- struct pam_response * responses = NULL;
- if (conv->conv(1, &pmessage, &responses, conv->appdata_ptr) != PAM_SUCCESS || responses == NULL) {
- return NULL;
- }
-
- char * promptval = responses->resp;
- free(responses);
-
- /* If we didn't get anything, just move on */
- if (promptval == NULL) {
- return NULL;
- }
-
- if (type == PAM_AUTHTOK) {
- if (mlock(promptval, strlen(promptval) + 1) != 0) {
- free(promptval);
- return NULL;
- }
- }
-
- if (type == PAM_RHOST) {
- char * subloc = strstr(promptval, "://");
- if (subloc != NULL) {
- char * original = promptval;
- char * newish = subloc + strlen("://");
- char * endslash = strstr(newish, "/");
-
- if (endslash != NULL) {
- endslash[0] = '\0';
- }
-
- promptval = strdup(newish);
- free(original);
- }
- }
-
- char * retval = NULL;
- if (promptval != NULL) { /* Can't believe it really would be at this point, but let's be sure */
- if (type != PAM_TYPE_SESSIONTYPE) {
- /* We can only use the PAM functions if it's not the session type */
- pam_set_item(pamh, type, (const void *)promptval);
- /* We're returning the value saved by PAM so we can clear promptval */
- pam_get_item(pamh, type, (const void **)&retval);
- }
- if (type == PAM_TYPE_SESSIONTYPE) {
- /* The session type can be saved globally so we can use it for open */
- if (global_session != NULL) {
- free(global_session);
- }
- global_session = strdup(promptval);
- retval = global_session;
- }
- if (type == PAM_AUTHTOK) {
- /* We also save the password globally if we've got one */
- if (global_password != NULL) {
- memset(global_password, 0, strlen(global_password));
- munlock(global_password, strlen(global_password) + 1);
- free(global_password);
- }
- global_password = strdup(promptval);
- if (mlock(global_password, strlen(global_password) + 1) != 0) {
- /* Woah, can't lock it. Can't keep it. */
- free(global_password);
- global_password = NULL;
- } else {
- retval = global_password;
- }
- }
-
- if (type == PAM_AUTHTOK) {
- memset(promptval, 0, strlen(promptval) + 1);
- munlock(promptval, strlen(promptval) + 1);
- }
-
- free(promptval);
- }
-
- return retval;
-}
-
-#define GET_ITEM(val, type) \
- if ((val = get_item(pamh, type)) == NULL) { \
- retval = PAM_AUTH_ERR; \
- goto done; \
- }
-
-/* Authenticate. We need to make sure we have a user account, that
- there are remote accounts and then verify them with X2Go */
-PAM_EXTERN int
-pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv)
-{
- char * username = NULL;
- char * password = NULL;
- char * ruser = NULL;
- char * rhost = NULL;
- char * rsession = NULL;
- int retval = PAM_IGNORE;
-
- /* Get all the values, or prompt for them, or return with
- an auth error */
- GET_ITEM(username, PAM_USER);
- GET_ITEM(ruser, PAM_RUSER);
- GET_ITEM(rhost, PAM_RHOST);
- GET_ITEM(rsession, PAM_TYPE_SESSIONTYPE);
- GET_ITEM(password, PAM_AUTHTOK);
-
- int stdinpipe[2];
- if (pipe(stdinpipe) != 0) {
- retval = PAM_SYSTEM_ERR;
- goto done;
- }
-
- /* At this point we should have the values, let's check the auth */
- pid_t pid;
- switch (pid = fork()) {
- case 0: { /* child */
- pam_sm_authenticate_helper (stdinpipe, username, rhost, ruser, rsession);
- break;
- }
- case -1: { /* fork'n error! */
- retval = PAM_SYSTEM_ERR;
- break;
- }
- default: {
- int forkret = 0;
- int bytesout = 0;
-
- bytesout += write(stdinpipe[1], password, strlen(password));
- bytesout += write(stdinpipe[1], "\n", 1);
-
- close(stdinpipe[1]);
-
- if (waitpid(pid, &forkret, 0) < 0 || bytesout == 0) {
- retval = PAM_SYSTEM_ERR;
- } else if (forkret == 0) {
- retval = PAM_SUCCESS;
- } else {
- retval = PAM_AUTH_ERR;
- }
- }
- }
-
- /* Return our status */
-done:
- return retval;
-}
-
-
-
-pid_t session_pid = 0;
-/* Open Session. Here we need to fork a little process so that we can
- give the credentials to the session itself so that it can startup the
- PyHoca (X2Go) client for the login */
-PAM_EXTERN int
-pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char ** argv)
-{
- char * username = NULL;
- char * password = NULL;
- char * ruser = NULL;
- char * rhost = NULL;
- char * rsession = NULL;
- int retval = PAM_SUCCESS;
-
- /* Get all the values, or prompt for them, or return with
- an auth error */
- GET_ITEM(username, PAM_USER);
- GET_ITEM(ruser, PAM_RUSER);
- GET_ITEM(rhost, PAM_RHOST);
- GET_ITEM(rsession, PAM_TYPE_SESSIONTYPE);
- GET_ITEM(password, PAM_AUTHTOK);
-
- struct passwd * pwdent = getpwnam(username);
- if (pwdent == NULL) {
- retval = PAM_SYSTEM_ERR;
- goto done;
- }
-
- if (session_pid != 0) {
- unpriveleged_kill(pwdent);
- }
-
- int sessionready[2];
- if (pipe(sessionready) != 0) {
- retval = PAM_SYSTEM_ERR;
- goto done;
- }
-
- pid_t pid = fork();
- if (pid == 0) {
-
- int ret = session_socket_handler(pwdent, sessionready[1], ruser, rhost, rsession, password);
-
- close(sessionready[1]);
- _exit(ret);
- } else if (pid < 0) {
- close(sessionready[0]);
- close(sessionready[1]);
-
- retval = PAM_SYSTEM_ERR;
- } else {
- char readbuffer[strlen(ALL_GOOD_SIGNAL) + 1];
- int readlen = 0;
-
- readlen = read(sessionready[0], readbuffer, strlen(ALL_GOOD_SIGNAL) + 1);
-
- close(sessionready[0]);
-
- if (readlen == strlen(ALL_GOOD_SIGNAL) + 1) {
- session_pid = pid;
- } else {
- retval = PAM_SYSTEM_ERR;
- }
- }
-
-done:
- return retval;
-}
-
-/* Close Session. Make sure our little guy has died so he doesn't become
- a zombie and eat things. */
-PAM_EXTERN int
-pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv)
-{
- if (session_pid == 0) {
- return PAM_IGNORE;
- }
-
- char * username = NULL;
- int retval = PAM_SUCCESS;
-
- GET_ITEM(username, PAM_USER);
-
- struct passwd * pwdent = getpwnam(username);
- if (pwdent == NULL) {
- retval = PAM_SYSTEM_ERR;
- goto done;
- }
-
- retval = unpriveleged_kill(pwdent);
-
-done:
- return retval;
-}
-
-/* Drop privs and try to kill the process with the PID of session_pid.
- This ensures that we don't kill something important if there is PID wrap
- around. */
-static int
-unpriveleged_kill (struct passwd * pwdent)
-{
- int retval = PAM_SUCCESS;
-
- pid_t pid = fork();
- if (pid == 0) {
- /* Setting groups, but allowing EPERM as if we're not 100% root
- we might not be able to do this */
- if (setgroups(1, &pwdent->pw_gid) != 0 && errno != EPERM) {
- _exit(EXIT_FAILURE);
- }
-
- if (setgid(pwdent->pw_gid) < 0 || setuid(pwdent->pw_uid) < 0 ||
- setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) {
- _exit(EXIT_FAILURE);
- }
-
- if (clearenv() != 0) {
- _exit(EXIT_FAILURE);
- }
-
- int killval = kill(session_pid, SIGKILL);
- session_pid = 0;
-
- if (killval != 0) {
- printf("Unable to kill\n");
- }
-
- /* NOTE: We're ignoring whether we could kill it or not. It'd be nice to
- track that but there are a lot of reason that we could fail there and
- it's not a bad thing. Really we're attempting a best effort to clean up
- we won't be able to gaurantee it. */
- _exit(EXIT_SUCCESS);
- } else if (pid < 0) {
- retval = PAM_SYSTEM_ERR;
- } else {
- int forkret = 0;
-
- if (waitpid(pid, &forkret, 0) < 0) {
- retval = PAM_SYSTEM_ERR;
- }
- }
-
- /* We reset this no matter. If we error'd trying to do it, we don't
- want to try again. We'll just return the error for this time. */
- session_pid = 0;
-
- return retval;
-}
-
-/* LightDM likes to have this function around, but we don't need it as we
- don't have a token hanging around. */
-PAM_EXTERN int
-pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv)
-{
- return PAM_SUCCESS;
-}
-
-#ifdef PAM_STATIC
-
-struct pam_module _pam_x2go_modstruct = {
- "pam_x2go",
- pam_sm_authenticate,
- pam_sm_setcred,
- NULL,
- pam_sm_open_session,
- pam_sm_close_session,
- NULL,
-};
-
-#endif
diff --git a/src/x2go-auth-check.c b/src/x2go-auth-check.c
deleted file mode 100644
index 3037e18..0000000
--- a/src/x2go-auth-check.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- * Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Author libpam-freerdp (where we forked from): Ted Gould <ted at canonical.com>
- */
-
-#include <libssh/libssh.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-
-
-int
-main (int argc, char * argv[])
-{
- int verbosity = SSH_LOG_NOLOG;
-
- char password[512];
- if (argc != 4) {
- printf("Not enough params");
- return -1;
- }
-
- if (scanf("%511s", password) != 1) {
- return -1;
- }
-
- if (mlock(password, sizeof(password)) != 0) {
- return -1;
- }
-
- ssh_session auth_check_ssh_session = ssh_new();
-
- ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity );
- ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_USER, argv[2] );
-
- char * colonloc = strstr(argv[1], ":");
- if (colonloc != NULL) {
- /* We've got a port to deal with */
- colonloc[0] = '\0';
- colonloc++;
- long port = strtoul(colonloc, NULL, 10);
-
- char *array[2];
- array[0] = strtok( argv[1], ":" );
- char *hostname = array[0];
-
- ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_HOST, hostname );
-
- ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_PORT, &port );
- } else {
- ssh_options_set ( auth_check_ssh_session, SSH_OPTIONS_HOST, argv[1] );
- }
-
- int rc;
- rc = ssh_connect ( auth_check_ssh_session );
- if ( rc != SSH_OK ) {
- fprintf ( stderr, "Error connecting to via SSH: %s\n", ssh_get_error ( auth_check_ssh_session ) );
- ssh_free(auth_check_ssh_session);
- return -1;
- }
-
- rc = ssh_userauth_password ( auth_check_ssh_session, NULL, password );
- if ( rc != SSH_AUTH_SUCCESS ) {
- fprintf ( stderr, "Error connecting to via SSH: %s\n", ssh_get_error ( auth_check_ssh_session ) );
- ssh_disconnect(auth_check_ssh_session);
- ssh_free(auth_check_ssh_session);
- return -1;
- }
-
- memset(password, 0, sizeof(password));
- munlock(password, sizeof(password));
-
- return 0;
-}
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index ce629ea..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-CLEANFILES =
-DISTCLEANFILES =
-EXTRA_DIST =
-
-TESTS = \
- test-x2go-wrapper
-
-check_PROGRAMS = \
- test-x2go-auth \
- $(TESTS)
-
-AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
- $(REMOTE_APPS_MANAGER_CFLAGS) \
- -I${top_srcdir}/src -Wall -Werror
-AM_CXXFLAGS = $(GTEST_CXXFLAGS) \
- $(REMOTE_APPS_MANAGER_CFLAGS)
-
-AM_CFLAGS = \
- -Wall \
- -g
-
-##########################
-# Google Test Test Suite #
-##########################
-
-check_LIBRARIES = libgtest.a
-
-nodist_libgtest_a_SOURCES = \
- $(GTEST_SOURCE)/src/gtest-all.cc \
- $(GTEST_SOURCE)/src/gtest_main.cc
-
-libgtest_a_CPPFLAGS = \
- $(GTEST_CPPFLAGS) -w \
- $(AM_CPPFLAGS)
-libgtest_a_CXXFLAGS = \
- $(AM_CXXFLAGS)
-
-##########################
-# Wrapper
-##########################
-
-test_x2go_wrapper: test-x2go-auth
-
-test_x2go_wrapper_SOURCES = \
- mock_pam.c mock_pam.h \
- mock_guest.c mock_guest.h \
- test-x2go-wrapper.cc
-
-test_x2go_wrapper_LDADD = \
- $(top_builddir)/src/libssh.la \
- libgtest.a
-
-test_x2go_wrapper_CXXFLAGS = \
- $(AM_CXXFLAGS) \
- -DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\"" \
- -I${top_srcdir}/src
-
-test_x2go_wrapper_LDFLAGS = \
- -pthread
-
-##########################
-# Auth tool
-##########################
-
-test_x2go_auth_SOURCES = \
- test-x2go-auth.c
-
diff --git a/tests/mock_guest.c b/tests/mock_guest.c
deleted file mode 100644
index ea4861b..0000000
--- a/tests/mock_guest.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
- * Copyright © 2012 Canonical Ltd. All rights reserved.
- *
- * Author(s): Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * David Barth <david.barth at canonical.com>
- *
- */
-
-#include <pwd.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <stdio.h>
-
-static struct passwd guest = { "guest",
- "password",
- 500, 500,
- "M. Guest",
- "/tmp",
- "/bin/true" };
-struct passwd *
-getpwnam (const char *username)
-{ return &guest; }
-
-int
-setgroups(size_t size, const gid_t *list)
-{
- errno = EPERM;
- return -1;
-}
-
-int
-setgid(gid_t gid)
-{ return 0; }
-
-int
-setuid(uid_t uid)
-{ return 0; }
-
-int
-setegid(gid_t gid)
-{ return 0; }
-
-int
-seteuid(uid_t uid)
-{ return 0; }
-
-int chmod(const char *path, mode_t mode)
-{ return 0; }
-
-int chown(const char *path, uid_t owner, gid_t group)
-{ return 0; }
-
-int execvp(const char *file, char *const argv[])
-{
- return 0;
-}
-/* wrap _exit, to make sure the gcov_exit function installed with atexit()
- is really called to collect coverage statistics */
-void _exit (int exitcode)
-{
- exit (exitcode);
-}
-
-
-#define BUFFER_SIZE 512
-
-/*Borrowed this code form socket-sucker.c in lightdm-remote-session-x2go*/
-int
-socket_sucker ()
-{
- int socket_fd = 0;
- int servlen = 0;
- struct sockaddr_un serv_addr;
-
- bzero((char *)&serv_addr, sizeof(serv_addr));
-
- const char * home = getenv("HOME");
- if (home == NULL) {
- return -1;
- }
-
- serv_addr.sun_family = AF_UNIX;
-
- int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket");
- if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) {
- return -1;
- }
-
- servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
-
- if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- return -1;
- }
-
- if (connect(socket_fd, (struct sockaddr *)&serv_addr, servlen) < 0) {
- return -1;
- }
-
- char buffer[BUFFER_SIZE + 2];
- int in = 0;
- int out = 0;
-
- in = read(socket_fd, buffer, BUFFER_SIZE);
-
- if (in > 0) {
- out = write(1, buffer, in);
- }
-
- close(socket_fd);
-
- if (in > 0 && out > 0 && in == out) {
- return 0;
- } else {
- return -1;
- }
-}
-
-
diff --git a/tests/mock_guest.h b/tests/mock_guest.h
deleted file mode 100644
index b7c78e8..0000000
--- a/tests/mock_guest.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
- * Copyright © 2012 Canonical Ltd. All rights reserved.
- *
- * Author(s): Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * David Barth <david.barth at canonical.com>
- *
- */
-
-#ifndef __MOCK_GUEST_H__
-#define __MOCK_GUEST_H__
-
-#include <pwd.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-struct passwd *getpwnam (const char *username);
-int setgroups(size_t size, const gid_t *list);
-int setgid(gid_t gid);
-int setuid(uid_t uid);
-int setegid(gid_t gid);
-int seteuid(uid_t uid);
-int chmod(const char *path, mode_t mode);
-int chown(const char *path, uid_t owner, gid_t group);
-int execvp(const char *file, char *const argv[]);
-int socket_sucker();
-
-#endif
diff --git a/tests/mock_pam.c b/tests/mock_pam.c
deleted file mode 100644
index 64c503f..0000000
--- a/tests/mock_pam.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
- * Copyright © 2012 Canonical Ltd. All rights reserved.
- *
- * Author(s): Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * David Barth <david.barth at canonical.com>
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "mock_pam.h"
-
-struct pam_handle {
- void *item[PAM_NUM_ITEMS];
-
- struct pam_conv *conv;
-
- /* note: the other fields have been omitted */
-};
-
-int fake_conv (int num_msg, const struct pam_message **msg,
- struct pam_response **resp, void *appdata_ptr)
-{
- struct pam_response *response = NULL;
- response = malloc (sizeof (struct pam_response));
-
- if (response == NULL)
- return PAM_BUF_ERR;
-
- response->resp_retcode = 0;
-
- if (strcmp((*msg)->msg, "login:") == 0)
- response->resp = strdup ("guest"); /* IMPORTANT: this needs to be in /etc/passwd */
- else if (strcmp((*msg)->msg, "remote login:") == 0)
- response->resp = strdup ("ruser");
- else if (strcmp((*msg)->msg, "remote host:") == 0)
- response->resp = strdup ("protocol://rhost/dummy");
- else if (strcmp((*msg)->msg, "password:") == 0)
- response->resp = strdup ("password");
- else if (strcmp((*msg)->msg, "sessiontype:") == 0)
- response->resp = strdup ("sessiontype");
- else
- return PAM_SYMBOL_ERR; /* leaks... */
-
- *resp = response;
-
- return PAM_SUCCESS;
-}
-
-struct pam_conv static_conv = { &fake_conv, (void *)NULL };
-
-pam_handle_t *pam_handle_new (void)
-{
- pam_handle_t *newh = malloc (sizeof (pam_handle_t));
-
- if (newh != NULL) {
- newh->conv = &static_conv;
- memset(newh->item, 0, sizeof(void *) * PAM_NUM_ITEMS);
- }
-
- return newh;
-}
-
-int pam_get_item (const pam_handle_t *pamh, int type, const void **value)
-{
- if (pamh == NULL)
- return PAM_SYSTEM_ERR;
-
- if (type == PAM_CONV)
- *value = pamh->conv;
- else if (pamh->item[type] != NULL)
- *value = pamh->item[type];
- else
- *value = NULL; /* will result in a prompt conversation */
-
- return PAM_SUCCESS;
-}
-
-int pam_set_item (pam_handle_t *pamh, int type, const void *value)
-{
- if (pamh == NULL)
- return PAM_SYSTEM_ERR;
-
- void **slot, *tmp;
- size_t nsize, osize;
-
- slot = &pamh->item[type];
- osize = nsize = 0;
-
- if (*slot != NULL)
- osize = strlen((const char *)*slot) + 1;
- if (value != NULL)
- nsize = strlen((const char *)value) + 1;
-
- if (*slot != NULL) {
- memset(*slot, 0xd0, osize);
- free(*slot);
- }
-
- if (value != NULL) {
- if ((tmp = malloc(nsize)) == NULL)
- return PAM_BUF_ERR;
- memcpy(tmp, value, nsize);
- } else {
- tmp = NULL;
- }
- *slot = tmp;
-
- return PAM_SUCCESS;
-}
diff --git a/tests/mock_pam.h b/tests/mock_pam.h
deleted file mode 100644
index c335e49..0000000
--- a/tests/mock_pam.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
- * Copyright © 2012 Canonical Ltd. All rights reserved.
- *
- * Author(s): Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * David Barth <david.barth at canonical.com>
- *
- */
-
-#ifndef __MOCK_PAM_H__
-#define __MOCK_PAM_H__
-
-#include <security/pam_modules.h>
-#include <security/pam_modutil.h>
-#include <security/pam_appl.h>
-
-#define PAM_NUM_ITEMS PAM_AUTHTOK_TYPE
-
-typedef struct pam_handle pam_handle_t;
-
-pam_handle_t *pam_handle_new (void);
-int pam_get_item (const pam_handle_t *pamh, int type, const void **value);
-int pam_set_item (pam_handle_t *pamh, int type, const void *value);
-
-#endif
diff --git a/tests/test-x2go-auth.c b/tests/test-x2go-auth.c
deleted file mode 100644
index 592f0c7..0000000
--- a/tests/test-x2go-auth.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- * Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * Author libpam-freerdp (where we forked from): Ted Gould <ted at canonical.com>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-main (int argc, char * argv[])
-{
- char password[512];
- if (argc != 4) {
- printf("Not enough params");
- return -1;
- }
-
- if (scanf("%511s", password) != 1) {
- return -1;
- }
-
- /* Check username */
- if (strcmp(argv[2], "ruser")) {
- return -1;
- }
-
- /* Check password */
- if (strcmp(password, "password")) {
- return -1;
- }
-
- /* Check session type */
- if (strcmp(argv[3], "sessiontype")) {
- return -1;
- }
-
- /* Check hostname */
- if (strcmp(argv[1], "rhost")) {
- return -1;
- }
-
- return 0;
-}
diff --git a/tests/test-x2go-wrapper.cc b/tests/test-x2go-wrapper.cc
deleted file mode 100644
index a792d3e..0000000
--- a/tests/test-x2go-wrapper.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright © 2012-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
- * Copyright © 2012 Canonical Ltd. All rights reserved.
- *
- * Author(s): Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- * David Barth <david.barth at canonical.com>
- *
- */
-
-#include <gtest/gtest.h>
-
-extern "C" {
-
-#include "mock_pam.h"
-#include "mock_guest.h"
-
- int x2goclient_wrapper (int argc, char * argv[]);
-
-const char * auth_check_path = AUTH_CHECK;
-
-}
-
-namespace {
-
- // The fixture for testing class Foo.
- class X2GoWrapperTest : public ::testing::Test {
- protected:
- // You can remove any or all of the following functions if its body
- // is empty.
-
- X2GoWrapperTest() {
- // You can do set-up work for each test here.
- setenv("HOME", "/tmp", 1 /* overwrite */);
- }
-
- virtual ~X2GoWrapperTest() {
- // You can do clean-up work that doesn't throw exceptions here.
- }
-
- // If the constructor and destructor are not enough for setting up
- // and cleaning up each test, you can define the following methods:
-
- virtual void SetUp() {
- // Code here will be called immediately after the constructor (right
- // before each test).
- unlink("/tmp/.x2go-socket");
- }
-
- virtual void TearDown() {
- // Code here will be called immediately after each test (right
- // before the destructor).
- unlink("/tmp/.x2go-socket");
- }
-
- // Objects declared here can be used by all tests in the test case for Foo.
- };
-
- TEST_F(X2GoWrapperTest, canLinkTheWholeGang) {
- EXPECT_EQ (1, 1); // right, that's trivial, but that means
- // that I got all of the wrapper and pam to link there
- }
-
- TEST_F(X2GoWrapperTest, canCallPamOpenSession) {
- const char *argv[] = { NULL };
-
- pam_handle_t *pamh = pam_handle_new ();
-
- EXPECT_EQ (PAM_SUCCESS,
- pam_sm_authenticate (pamh, 0, 0, argv));
- EXPECT_EQ (PAM_SUCCESS,
- pam_sm_setcred (pamh, 0, 0, argv));
-
- EXPECT_EQ (PAM_SUCCESS,
- pam_sm_open_session (pamh, 0, 0, argv));
- EXPECT_EQ(0, socket_sucker());
- EXPECT_EQ (PAM_SUCCESS,
- pam_sm_close_session (pamh, 0, 0, argv));
- }
-
-}
--
Alioth's /srv/git/code.x2go.org/libpam-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/libpam-x2go.git
More information about the x2go-commits
mailing list