x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - build-main (branch) updated: e493cec35e40ff6cf8bcbd093db641b411db6b7b
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via e493cec35e40ff6cf8bcbd093db641b411db6b7b (commit) from 1320b51ee27286d96eb8c5f9d4bb1254e8683804 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .../x2gobroker.cgi => cgi/x2gobroker-simple.cgi | 10 +- debian/changelog | 6 + debian/compat | 1 + debian/control | 64 ++ debian/copyright | 652 ++++++++++++++++++++ debian/rules | 3 + debian/source/format | 1 + debian/x2gobroker-common.dirs | 1 + debian/x2gobroker-common.docs | 3 + debian/x2gobroker-common.install | 1 + debian/x2gobroker-simple.dirs | 2 + debian/x2gobroker-simple.docs | 3 + debian/x2gobroker-simple.install | 3 + etc/x2gobroker-simple.cfg | 4 + simple-broker/x2gobroker => lib/x2gobroker-command | 0 .../x2gobroker.pm => lib/x2gobroker-simple.pm | 28 +- simple-broker/x2gobroker.cfg | 3 - 17 files changed, 763 insertions(+), 22 deletions(-) create mode 100644 NEWS create mode 100644 README create mode 100644 TODO rename simple-broker/x2gobroker.cgi => cgi/x2gobroker-simple.cgi (85%) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/x2gobroker-common.dirs create mode 100644 debian/x2gobroker-common.docs create mode 100644 debian/x2gobroker-common.install create mode 100644 debian/x2gobroker-simple.dirs create mode 100644 debian/x2gobroker-simple.docs create mode 100644 debian/x2gobroker-simple.install create mode 100644 etc/x2gobroker-simple.cfg rename simple-broker/x2gobroker => lib/x2gobroker-command (100%) rename simple-broker/x2gobroker.pm => lib/x2gobroker-simple.pm (94%) delete mode 100644 simple-broker/x2gobroker.cfg The diff of changes is: diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/TODO b/TODO new file mode 100644 index 0000000..e69de29 diff --git a/simple-broker/x2gobroker.cgi b/cgi/x2gobroker-simple.cgi similarity index 85% rename from simple-broker/x2gobroker.cgi rename to cgi/x2gobroker-simple.cgi index 9a8b234..6add473 100755 --- a/simple-broker/x2gobroker.cgi +++ b/cgi/x2gobroker-simple.cgi @@ -3,8 +3,9 @@ use strict; use CGI; use CGI::Carp qw(fatalsToBrowser); -use lib "/usr/lib/x2go"; -use x2gobroker; +use lib "/usr/lib/x2go/"; +use lib "/usr/lib/x2go/broker/"; +use x2gobroker-simple; my $cgi = new CGI; @@ -13,16 +14,15 @@ my @formValues = $cgi->param(); print $cgi->header(-type =>'text/html', -expires =>'+1h'), $cgi->start_html( -title =>'X2Go Broker', - -author =>'team(a)obviously-nice.de', + -author =>'X2Go Developers <x2go-dev(a)lists.berlios.de>', -base =>'true', - -meta =>{'keywords' =>'x2go', + -meta =>{'keywords' =>'X2Go', 'description'=>'X2Go Broker'}); #open (FL, ">>/tmp/x2gobroker.log"); #print FL `date`; #print FL "called method ".$cgi->param('task')." from ".$ENV{REMOTE_ADDR}."\n"; #close (FL); - if($cgi->param('task') eq 'testcon') { for ( my $i=0;$i<2*1024*1024;$i++ ) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b4e2099 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * Setting up new public X2Go project: x2gohttpbroker. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Sep 2012 17:30:24 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..e4f579f --- /dev/null +++ b/debian/control @@ -0,0 +1,64 @@ +Source: x2gobroker +Section: web +Priority: optional +Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Build-Depends: + debhelper (>= 7.0.50~), + cdbs (>= 0.4.90~), +Standards-Version: 3.9.3 + +Package: x2gobroker-simple +Architecture: all +Depends: + ${perl:Depends}, + ${misc:Depends}, +Description: X2Go http(s) session broker (simple broker) + X2Go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains a simple example of an X2Go session + broker. + +Package: x2gobroker-common +Architecture: all +Depends: + ${perl:Depends}, + ${misc:Depends}, +Description: X2Go http(s) based session broker (common files) + X2Go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains common files needed by all X2Go session + brokers being package for this distribution. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..3d1bdfc --- /dev/null +++ b/debian/copyright @@ -0,0 +1,652 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: X2Go Broker +Upstream-Contact: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Source: http://code.x2go.org/releases/source/x2gohttpbroker + +Files: * +Copyright: + 2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + 2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +License: AGPL-3+ + +Files: debian/* +Copyright: 2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +License: AGPL-3+ + +License: AGPL-3+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + . + You should have received a copy of the GNU Affero General Public License + along with this program; if not, write to the + Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + The full license text can be read below. + . + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for + software and other kinds of works, specifically designed to ensure + cooperation with the community in the case of network server software. + . + The licenses for most software and other practical works are designed + to take away your freedom to share and change the works. By contrast, + our General Public Licenses are 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. + . + 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. + . + Developers that use our General Public Licenses protect your rights + with two steps: (1) assert copyright on the software, and (2) offer + you this License which gives you legal permission to copy, distribute + and/or modify the software. + . + A secondary benefit of defending all users' freedom is that + improvements made in alternate versions of the program, if they + receive widespread use, become available for other developers to + incorporate. Many developers of free software are heartened and + encouraged by the resulting cooperation. However, in the case of + software used on network servers, this result may fail to come about. + The GNU General Public License permits making a modified version and + letting the public access it on a server without ever releasing its + source code to the public. + . + The GNU Affero General Public License is designed specifically to + ensure that, in such cases, the modified source code becomes available + to the community. It requires the operator of a network server to + provide the source code of the modified version running there to the + users of that server. Therefore, public use of a modified version, on + a publicly accessible server, gives the public access to the source + code of the modified version. + . + An older license, called the Affero General Public License and + published by Affero, was designed to accomplish similar goals. This is + a different license, not a version of the Affero GPL, but Affero has + released a new version of the Affero GPL which permits relicensing under + this license. + . + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + . + .Notwithstanding any other provision of this License, if you modify the + Program, your modified version must prominently offer all users + interacting with it remotely through a computer network (if your version + supports such interaction) an opportunity to receive the Corresponding + Source of your version by providing access to the Corresponding Source + from a network server at no charge, through some standard or customary + means of facilitating copying of software. This Corresponding Source + shall include the Corresponding Source for any work covered by version 3 + of the GNU General Public License that is incorporated pursuant to the + following paragraph. + . + 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 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 work with which it is combined will remain governed by version + 3 of the GNU General Public License. + . + 14. Revised Versions of this License. + . + The Free Software Foundation may publish revised and/or new versions of + the GNU Affero 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 Affero 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 Affero 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 Affero 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 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a190714 --- /dev/null +++ b/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk \ No newline at end of file diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/x2gobroker-common.dirs b/debian/x2gobroker-common.dirs new file mode 100644 index 0000000..88c7d70 --- /dev/null +++ b/debian/x2gobroker-common.dirs @@ -0,0 +1 @@ +/usr/lib/x2go/broker \ No newline at end of file diff --git a/debian/x2gobroker-common.docs b/debian/x2gobroker-common.docs new file mode 100644 index 0000000..5502ed8 --- /dev/null +++ b/debian/x2gobroker-common.docs @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install new file mode 100644 index 0000000..4f12f9f --- /dev/null +++ b/debian/x2gobroker-common.install @@ -0,0 +1 @@ +lib/x2gobroker-command usr/lib/x2go/broker/ \ No newline at end of file diff --git a/debian/x2gobroker-simple.dirs b/debian/x2gobroker-simple.dirs new file mode 100644 index 0000000..909bc86 --- /dev/null +++ b/debian/x2gobroker-simple.dirs @@ -0,0 +1,2 @@ +/etc/x2go +/usr/lib/cgi-bin \ No newline at end of file diff --git a/debian/x2gobroker-simple.docs b/debian/x2gobroker-simple.docs new file mode 100644 index 0000000..5502ed8 --- /dev/null +++ b/debian/x2gobroker-simple.docs @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/x2gobroker-simple.install b/debian/x2gobroker-simple.install new file mode 100644 index 0000000..6ef2bee --- /dev/null +++ b/debian/x2gobroker-simple.install @@ -0,0 +1,3 @@ +etc/x2gobroker-simple.cfg etc/x2go/ +lib/x2gobroker-simple.pm usr/lib/x2go/broker/ +cgi/x2gobroker-simple.cgi usr/bin/cgi-bin/ \ No newline at end of file diff --git a/etc/x2gobroker-simple.cfg b/etc/x2gobroker-simple.cfg new file mode 100644 index 0000000..88dfb10 --- /dev/null +++ b/etc/x2gobroker-simple.cfg @@ -0,0 +1,4 @@ +ldapuri=ldap://<ldapmaster.localdomain> +#replica=ldapi:/// +binddn="cn=admin,dc=example,dc=net" +bindpw="<very-secret>" diff --git a/simple-broker/x2gobroker b/lib/x2gobroker-command similarity index 100% rename from simple-broker/x2gobroker rename to lib/x2gobroker-command diff --git a/simple-broker/x2gobroker.pm b/lib/x2gobroker-simple.pm similarity index 94% rename from simple-broker/x2gobroker.pm rename to lib/x2gobroker-simple.pm index 3244e5f..6cd3ccc 100644 --- a/simple-broker/x2gobroker.pm +++ b/lib/x2gobroker-simple.pm @@ -1,4 +1,4 @@ -package x2gobroker; +package x2gobroker-simple; use strict; use Net::LDAP; @@ -9,11 +9,11 @@ use Data::Dumper; my $cfg=new Config::Simple(syntax=>'ini'); -$cfg->read("/etc/x2go/x2gobroker.cfg"); -my $ldapurl=$cfg->param('ldapurl'); +$cfg->read("/etc/x2go/x2gobroker-simple.cfg"); +my $ldapuri=$cfg->param('ldapuri'); my $replica=$cfg->param('replica'); -my $ldapbinddn=$cfg->param('ldapbinddn'); -my $ldappass=$cfg->param('ldappass'); +my $binddn=$cfg->param('binddn'); +my $bindpw=$cfg->param('bindpw'); use base 'Exporter'; our @EXPORT = ('checkAccess', 'listSessions', 'selectSession', 'setPass'); @@ -36,7 +36,7 @@ sub initLdap if(-e "/etc/x2go/x2gobroker/replicaldap.lock") { $masterlocked=1; - my ($ldap,$error)=initLDAPServer( $ldapurl ); + my ($ldap,$error)=initLDAPServer( $ldapuri ); if(!$ldap) { `touch /etc/x2go/x2gobroker/masterldap.lock`; @@ -57,7 +57,7 @@ sub initLdap } if(!int(rand(2))) { - my ($ldap,$error)=initLDAPServer( $ldapurl ); + my ($ldap,$error)=initLDAPServer( $ldapuri ); if(!$ldap) { `touch /etc/x2go/x2gobroker/masterldap.lock`; @@ -83,7 +83,7 @@ sub initMasterLdap { die "Master LDAP server is down\n"; } - my ($ldap,$error)=initLDAPServer( $ldapurl ); + my ($ldap,$error)=initLDAPServer( $ldapuri ); if(!$ldap) { `touch /etc/x2go/x2gobroker/masterldap.lock`; @@ -101,7 +101,7 @@ sub initLDAPServer notify("LDAP server $url is down ($@). Please, repair it and remove lock file in /etc/x2go/x2gobroker\n"); return (0,"$@"); } - my $message = $ldap->bind($ldapbinddn,password=>$ldappass); + my $message = $ldap->bind($binddn,password=>$bindpw); if(!$message) { notify("LDAP server $url is down ($@). Please, repair it and remove lock file in /etc/x2go/x2gobroker\n"); @@ -128,7 +128,7 @@ sub setPass my $ldap = initMasterLdap(); - my $dn="cn=$user,ou=BrokerUsers".getBase($ldapbinddn); + my $dn="cn=$user,ou=BrokerUsers".getBase($binddn); my $message=$ldap->modify($dn, changes => $changes); if($message->code) @@ -153,7 +153,7 @@ sub getExtCon my $ldap = initLdap(); - my $dn="cn=$host,ou=Servers,ou=ON".getBase($ldapbinddn); + my $dn="cn=$host,ou=Servers,ou=ON".getBase($binddn); my $message=$ldap->search(base => $dn, scope => 'base', filter => '(objectClass=ipHost)'); @@ -410,7 +410,7 @@ sub getSessionRunning sub remoteBroker { my ($ip, $user, $cmd, $dn, $ldap)=@_; - my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$ip -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/x2gobroker/x2gobroker $user $cmd 2>/dev/null\"`; + my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$ip -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/broker/x2gobroker-command $user $cmd 2>/dev/null\"`; my @rarr=split("\n",$res); my $stat; if(@rarr[0] eq 'OK') @@ -463,7 +463,7 @@ sub checkAccess my $ldap = initLdap(); - my $dn="uid=$user,ou=People".getBase($ldapbinddn); + my $dn="uid=$user,ou=People".getBase($binddn); my $mesg=$ldap->search(base => $dn, scope => 'base', filter => '(objectClass=posixAccount)'); @@ -488,7 +488,7 @@ sub listSessions my $ldap = initLdap(); - my $dn="ou=Servers,ou=ON".getBase($ldapbinddn); + my $dn="ou=Servers,ou=ON".getBase($binddn); my $message=$ldap->search(base => $dn, scope => 'sub', filter => '(objectClass=ipHost)'); diff --git a/simple-broker/x2gobroker.cfg b/simple-broker/x2gobroker.cfg deleted file mode 100644 index 6ec9474..0000000 --- a/simple-broker/x2gobroker.cfg +++ /dev/null @@ -1,3 +0,0 @@ -ldapurl=ldap://up -ldapbinddn="cn=ldapadmin,o=phoca,c=de" -ldappass="" hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.1
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via e0e9815beaf7d6de843ca0386cd92ed6cd14433f (commit) from f4026757bca650305a06382ca5521117ff82b4ee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c9d5d8e..badca68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (0.0.2.1): - - Remove trainling slashes from ManagementServer URLs. + - Remove trailing slashes from ManagementServer URLs. - In Apache2 vhost configuration example, move WSGI environment variable settings into VirtualHost setup. - Remove unused, not-yet-developed broker backends and frontends. @@ -14,8 +14,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low backend name. - In WSGI mode: only populate os.environ with variables matching »X2GOBROKER_*«. - - Make X2GOBROKER_SESSIONPROFILES configurable through a SetEnv WSGI - parameter in the httpd configuration. (Fixes: #210). + - Make X2GOBROKER_SESSIONPROFILES configurable via a SetEnv WSGI parameter + in the httpd configuration possible. (Fixes: #210). * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). @@ -25,7 +25,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - Install man pages and default files through Makefile, as well. (Fixes: #211). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 12:41:06 +0200 x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-16-gadcedf7
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via adcedf70d52d663534be1dcbf2e4f837516cd42c (commit) from 6a86e5a9784fdb3f5bfdb6e812a8895c29ef6c5d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/web/plain.py | 2 ++ 2 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 448093d..8eb7e11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - Security fix for setuid wrapper x2gobroker-agent.c. Hard-code path to x2gobroker-agent.pl during build via defining a macro in the Makefile. Thanks to Richard Weinberger for spotting this!!! + - Handle URLs in plain WebUI that have slashes (and subpaths) in the + backend name. * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index ca041df..0607bf2 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -56,6 +56,8 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND else: backend = backend.rstrip('/') + if '/' in backend: + backend = backend.split('/')[0] # silence pyflakes... broker_backend = None hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-20-gf402675
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via f4026757bca650305a06382ca5521117ff82b4ee (commit) from a8dbd6b888cf3b9321ecd42086defc68532e774f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 5 +++-- x2gobroker/brokers/base_broker.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 8d060ec..84bfc44 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -139,8 +139,9 @@ name=LXDE - srv-D command=LXDE acl-groups-allow=admins acl-groups-deny=ALL -acl-clients-deny=ALL -acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local +## make sure hostnames in client ACLs are resolvable via libnss!!! +#acl-clients-deny=ALL +#acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local acl-any-order=deny-allow ## diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 2ce0ba4..590087a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -336,6 +336,8 @@ class X2GoBroker(object): _deny_address_set = netaddr.IPSet(_acls_clients_deny) except netaddr.core.AddrFormatError, e: logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e))) + except ValueError, e: + logger_error.error('base_broker.X2GoBroker.check_acls(): ValueError - {why}'.format(why=str(e))) _allow_client = self._client_address in _allow_address_set _deny_client = self._client_address in _deny_address_set hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-18-g38cb739
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 38cb739cadb423bfbc6fc4a0b71473ec3859550b (commit) from 703353dd9fc0031109cf4af4d8b497efbf6013b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/inifile_broker.py | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index 3071a13..b9f8a16 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -33,10 +33,6 @@ import x2gobroker.config import x2gobroker.defaults class X2GoBroker(base.X2GoBroker): - """\ - - """ -class X2GoBroker(base.X2GoBroker): backend_name = 'inifile' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-19-ga8dbd6b
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via a8dbd6b888cf3b9321ecd42086defc68532e774f (commit) from 38cb739cadb423bfbc6fc4a0b71473ec3859550b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/defaults.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a78bfda..c9d5d8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low backend name. - In WSGI mode: only populate os.environ with variables matching »X2GOBROKER_*«. + - Make X2GOBROKER_SESSIONPROFILES configurable through a SetEnv WSGI + parameter in the httpd configuration. (Fixes: #210). * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index f46e1b8..7d81b76 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -67,7 +67,10 @@ if os.environ.has_key('X2GOBROKER_CONFIG'): else: X2GOBROKER_CONFIG = "/etc/x2go/x2gobroker.conf" -X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" +if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): + X2GOBROKER_SESSIONPROFILES = os.environ['X2GOBROKER_SESSIONPROFILES'] +else: + X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" if os.environ.has_key('X2GOBROKER_AGENT_CMD'): X2GOBROKER_AGENT_CMD = os.environ['X2GOBROKER_AGENT_CMD'] @@ -103,9 +106,6 @@ if socket.gethostname().find('.') >= 0: else: X2GOBROKER_HOSTNAME = socket.gethostbyaddr(socket.gethostname())[0] - -X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" - # the home directory of the user that the daemon/cgi runs as X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~{broker_uid}'.format(broker_uid=X2GOBROKER_DAEMON_USER))) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-17-g703353d
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 703353dd9fc0031109cf4af4d8b497efbf6013b1 (commit) from adcedf70d52d663534be1dcbf2e4f837516cd42c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ sbin/x2gobroker | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8eb7e11..a78bfda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low Thanks to Richard Weinberger for spotting this!!! - Handle URLs in plain WebUI that have slashes (and subpaths) in the backend name. + - In WSGI mode: only populate os.environ with variables matching + »X2GOBROKER_*«. * Provide init scripts and *.default files outside of /debian folder (as they are also relevant for non-Debian packaging). diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 63823b4..c88eb97 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -157,7 +157,9 @@ else: del environ['SCRIPT_NAME'] # make sure the httpd server's environment is set as os.environ - os.environ = environ + for key in environ.keys(): + if key.startswith('X2GOBROKER_'): + os.environ.update({ key: environ[key] }) reload(x2gobroker.defaults) return _tornado_application(environ, start_response) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-6-g1cbf2c3
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 1cbf2c397ba3253681e4303e52017da30f48f2eb (commit) from 32d9d26f987613ad9d4fe7893ce07241975707af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 2308a72..f6ebaa4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -55,10 +55,6 @@ if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'): X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP'] else: X2GOBROKER_DAEMON_GROUP="x2gobroker" -if os.environ.has_key('X2GOBROKER_LOGCONFIG'): - X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] -else: - X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" if os.environ.has_key('X2GOBROKER_DEBUG'): X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-5-g32d9d26
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 32d9d26f987613ad9d4fe7893ce07241975707af (commit) from 3e0b0a48d874da2238d8fbb725f476a87f9f51ca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index cf544bb..a64361b 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -104,7 +104,7 @@ # immediately. # # This option can be overridden by the session profile parameter -# broker-session-autologin=<file-location> +# broker-session-autologin={true|false} #default-session-autologin=false hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-11-ga62fa86
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via a62fa864d38a7bad4938905782049d5d6af8d9bc (commit) from ae12eec822c2b508ca41df898e700855099d737a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 ++++++- 2 files changed, 49 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/Makefile b/Makefile index b5c2148..02382e5 100755 --- a/Makefile +++ b/Makefile @@ -73,3 +73,46 @@ clean_indep: test: install: + mkdir -p "${DESTDIR}/var/lib/x2gobroker" \ + "${DESTDIR}/var/log/x2gobroker" + + # python-x2gobroker + python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} + mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" + ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" + ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ + etc/broker/x2gobroker-loggers.conf \ + "${DESTDIR}${ETCDIR}/broker/" + mkdir -p "${DESTDIR}/etc/pam.d" + ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" + + # x2gobroker-agent + mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" + ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" + ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" + + # x2gobroker-authservice + mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ + "${DESTDIR}${ETCDIR}/broker" + ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" + ${INSTALL_FILE} logrotate/x2gobroker-authservice \ + "${DESTDIR}/etc/logrotate.d/" + ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ + "${DESTDIR}${ETCDIR}/broker/" + + # x2gobroker-daemon + mkdir -p "${DESTDIR}/etc/logrotate.d/" + ${INSTALL_FILE} logrotate/x2gobroker-daemon \ + "${DESTDIR}/etc/logrotate.d/" + + # x2gobroker-wsgi + mkdir -p "${DESTDIR}${ETCDIR}" "${DESTDIR}/etc/logrotate.d" + ${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \ + "${DESTDIR}${ETCDIR}/" + ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" + + # x2gobroker + mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" + ${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/" + ${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \ + "${DESTDIR}${SBINDIR}/" diff --git a/debian/changelog b/debian/changelog index c7712eb..91ee2fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - * New upstream version (0.0.2.0): + [ Mike Gabriel ] + * New upstream version (0.0.2.1): - Remove trainling slashes from ManagementServer URLs. - In Apache2 vhost configuration example, move WSGI environment variable settings into VirtualHost setup. - Remove unused, not-yet-developed broker backends and frontends. - Remove old cruft from x2gobroker.conf. + [ Jan Engelhardt ] + * New upstream version (0.0.2.1): + - Populate install target of Makefile. (Fixes: #201). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits