[Inteproxy-commits] r2 - / trunk

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Oct 30 16:53:57 CET 2006


Author: jan
Date: 2006-10-30 16:53:57 +0100 (Mon, 30 Oct 2006)
New Revision: 2

Added:
   trunk/
   trunk/COPYING
   trunk/InteProxy.py
Removed:
   COPYING
   InteProxy.py
Log:
Moving files into subdirectory "trunk" to conform with SVN policy.


Deleted: COPYING
===================================================================
--- COPYING	2006-10-30 15:51:39 UTC (rev 1)
+++ COPYING	2006-10-30 15:53:57 UTC (rev 2)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Deleted: InteProxy.py
===================================================================
--- InteProxy.py	2006-10-30 15:51:39 UTC (rev 1)
+++ InteProxy.py	2006-10-30 15:53:57 UTC (rev 2)
@@ -1,350 +0,0 @@
-#! /usr/bin/python
-# Copyright (C) 2006 by Intevation GmbH
-# Authors:
-# Bernhard Herzog <bh at intevation.de>
-#
-# This program is free software under the GPL (>=v2)
-# Read the file COPYING coming with the software for details.
-
-"""A HTTP server that translates http into https
-
-Usage:
-
-python InteProxy.py
-"""
-
-import sys
-import optparse
-import traceback
-import time
-import urlparse
-import urllib2
-import BaseHTTPServer
-import threading
-import Queue
-import socket
-
-try:
-    import pywin.dialogs.login
-    windowsystem = "pywin"
-except ImportError:
-    windowsystem = "crt"
-
-
-def getpassword_pywin(title):
-    return pywin.dialogs.login.GetLogin(title)
-
-def getpassword_crt(title):
-    import getpass
-    try:
-        user = raw_input(title)
-        password = getpass.getpass()
-    except IOError:
-        import traceback
-        traceback.print_exception()
-        user = password = None
-    return user, password
-
-getpassword = globals()["getpassword_" + windowsystem]
-
-# the central queue for the communication between master and worker
-# thread.
-the_queue = Queue.Queue(0)
-
-def worker_thread():
-    """The worker thread
-
-    This function takes requests out of the queue and handles them.
-    """
-    while 1:
-        request = the_queue.get()
-        request()
-
-
-class InteProxyHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-
-    # Whether the SHUTDOWN method is allowed.  If allowed, anybody who can
-    # connect to the server can shutdown the server.
-    allow_shutdown = False
-
-    def do_SHUTDOWN(self):
-        """Shutdown the server if self.allow_shutdown is True (default False).
-
-        To shutdown the server, this method calls the server's
-        server_close method.
-        """
-        if self.allow_shutdown:
-            self.server.server_close()
-            self.send_response(200)
-            # somewhat ugly hack: connect to this server, to unblock the
-            # accept call.
-            s = socket.socket(socket.AF_INET)
-            s.connect(("localhost", self.server.server_port))
-            s.close()
-        else:
-            self.send_error(400)
-
-    def do_GET(self):
-        """Handle a GET request"""
-        self.handle_proxy_request("GET")
-
-    def do_POST(self):
-        """Handle a POST request"""
-        self.handle_proxy_request("POST")
-
-    def handle_proxy_request(self, method):
-        """Handle a request that needs to be 'proxied'
-
-        Method should be either 'POST' or 'GET'.  Both methods are
-        handled in the same way.  The real host to connect to is
-        determined from the url: The path component starts with the real
-        hostname.  The method strips that hostname from the path and
-        connects to the new host.  All headers from the HTTP request and
-        any extra data are passed through to the remote host and the
-        reponse is likewise simply copied through.  The only exception
-        is the Host: header from the original request.  It would be
-        wrong, so it is removed and a new one is generated pointing to
-        the real remote host.
-        """
-        netloc, url = self.convert_url(self.path)
-
-        #
-        # Create a http request for the real location
-        #
-        request = urllib2.Request("https://%s/%s" % (netloc, url))
-        for header, value in self.headers.items():
-            if header.lower() == "host":
-                # the host header will be set by httplib and it should
-                # not be set twice, so we omit it.  The value we
-                # received from the client would have been wrong anyway
-                # as it refers to the host this proxy is running on.
-                continue
-            elif header.lower() in ("content-length", "content-type"):
-                # When a post request is redirected with the 302 code,
-                # urllib2 will do a GET request for the new url even
-                # when the original request was POST.  This does not
-                # conform to RFC 2616, but it's apparently what many
-                # clients do and some servers expect (e.g. a POST
-                # request to http://intevation.de/roundup/kolab/ is
-                # redirected to
-                # https://intevation.de/roundup/kolab/issue<num> and the
-                # server expects a GET request for that.).  However,
-                # when doing the new request urllib2 copies all headers
-                # except for those added with add_unredirected_header.
-                # The content-length and content-type headers are only
-                # needed for POST request so we have to make sure
-                # they're not send when redirection occurs.
-                request.add_unredirected_header(header, value)
-            else:
-                request.add_header(header, value)
-
-        # If any data is associated with the request pass it through
-        length = int(self.headers.getheader("Content-Length", "0"))
-        if length:
-            # FIXME: check whether length bytes were read
-            request.add_data(self.rfile.read(length))
-
-        #
-        # Retrieve the url described by the request and pass everything
-        # through to the client.
-        #
-        try:
-            response = urllib2.urlopen(request)
-        except urllib2.HTTPError, err:
-            # a HTTPError is a valid http response object, so we can
-            # treat it like a normal response.
-            response = err
-        self.send_response(response.code, response.msg)
-        for header, value in response.info().items():
-            self.send_header(header, value)
-        self.end_headers()
-
-        transfer_encoding = response.info().get("Transfer-encoding")
-        self.transfer_data(response.read, self.wfile.write,
-                           chunked = (transfer_encoding == "chunked"))
-
-    def transfer_data(self, read, write, length=None, chunked=False):
-        """Transfer data from one 'file' to another in chunks
-
-        The files are given by their read and write methods so it
-        doesn't have to be a file.  The read parameter must be callable
-        with an integer argument indicating the maximum number of bytes
-        to read and the write parameter must be callable with a string.
-        If the parameter chunked is true, the method uses the 'chunked'
-        transfer encoding when writing the data.
-        """
-        max_chunk_size = 4096
-        while 1:
-            if length is not None:
-                chunk_size = min(length, max_chunk_size)
-            else:
-                chunk_size = max_chunk_size
-            chunk = read(chunk_size)
-            if not chunk:
-                break
-            if length is not None:
-                length -= len(chunk)
-            if chunked:
-                write("%x\r\n" % len(chunk))
-            write(chunk)
-            if chunked:
-                write("\r\n")
-        if chunked:
-            write("0\r\n\r\n")
-
-    def convert_url(self, url):
-        """Extract the real host from the url and return host and new url
-
-        The URL parameter is the part of the URL from the GET or POST
-        request which is actually only the path, query and fragment in
-        the terminology of the urlparse module.  For the InteProxy, the
-        first component in the path is the actual host to connect to.
-        This method extracts that part and creates a new path with that
-        part removed.  The return value of this method is the tuple
-        (real_host, new_url) where new_url is the combined new path and
-        the original query and fragment parts.
-        """
-        scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
-
-        # both scheme and netloc must be empty strings because the url
-        # we work with is the url on the first line of a HTTP request
-        # which doesn't include them
-        assert scheme == ""
-        assert netloc == ""
-
-        split_path = path.split("/")
-        if not split_path[0]:
-            del split_path[0]
-        real_netloc = split_path.pop(0)
-        real_path = "/" + "/".join(split_path)
-        return real_netloc, urlparse.urlunsplit(("", "", real_path, query,
-                                                 fragment))
-
-    def log_exception(self, exc_info):
-        """Log an exception
-
-        This method produces a log message via self.log_message and then
-        prints a the exception given by exc_info, which should be the
-        return value of sys.exc_info, to stderr.  By default log_message
-        also writes to stderr, so both the message and the traceback
-        should go to the same place.
-        """
-        self.log_message("Exception for previous 500 code\n")
-        traceback.print_exception(*(exc_info + (None, sys.stderr)))
-        sys.stderr.flush()
-
-
-# same as the BaseHTTPRequestHandler method, but as a standalone function:
-def log_date_time_string():
-    """Return the current time formatted for logging."""
-    now = time.time()
-    year, month, day, hh, mm, ss, x, y, z = time.localtime(now)
-    s = "%02d/%3s/%04d %02d:%02d:%02d" % (
-        day, BaseHTTPServer.BaseHTTPRequestHandler.monthname[month],
-        year, hh, mm, ss)
-    return s
-
-
-class MasterWorkerServer(BaseHTTPServer.HTTPServer):
-
-    do_shutdown = False
-
-    def serve_forever(self):
-        """Handle requests until self.do_shutdown is True."""
-        while not self.do_shutdown:
-            self.handle_request()
-
-    def server_close(self):
-        """Shutdown the server.
-
-        Usually this is called from a thread while another thread
-        executes the server_forever method.  In that case the other
-        thread is most likely blocked while listening for new
-        connections.  After this method returns, the caller will have to
-        do something to unblock the other thread, such as creating a TCP
-        connection to the server.
-        """
-        BaseHTTPServer.HTTPServer.server_close(self)
-        self.do_shutdown = True
-
-    def process_request(self, request, client_address):
-        """Put the request into the queue to be handled by the worker thread
-        """
-        def process_in_worker():
-            try:
-                self.finish_request(request, client_address)
-                self.close_request(request)
-            except:
-                self.handle_error(request, client_address)
-                self.close_request(request)
-        sys.stderr.write("[%s] queue contains %d items\n" %
-                         (log_date_time_string(), the_queue.qsize()))
-        the_queue.put(process_in_worker)
-
-    def handle_error(self, request, client_address):
-        """Override to integrate the error reporting better with the other logs
-        """
-        sys.stderr.write("[%s] Exception while handling request from %r\n"
-                         % (log_date_time_string(), client_address))
-        traceback.print_exception(*(sys.exc_info() + (None, sys.stderr)))
-        sys.stderr.flush()
-
-
-class IntePasswordManager(urllib2.HTTPPasswordMgr):
-
-    def find_user_password(self, realm, authuri):
-        user, password \
-              = urllib2.HTTPPasswordMgr.find_user_password(self, realm, authuri)
-        if user is None:
-            # no password known yet.  Ask the user
-            authuri = "https://" + "".join(self.reduce_uri(authuri))
-            title = "Username for %r realm %r: " % (authuri, realm)
-            user, password = getpassword(title)
-        return user, password
-
-def setup_urllib2():
-    auth_handler = urllib2.HTTPBasicAuthHandler(IntePasswordManager())
-    httphandler = urllib2.HTTPHandler()
-    opener = urllib2.build_opener(auth_handler, httphandler)
-    urllib2.install_opener(opener)
-
-
-def run_server(HandlerClass = InteProxyHTTPRequestHandler,
-               ServerClass = MasterWorkerServer):
-    """Run the InteProxy server"""
-    parser = optparse.OptionParser()
-    parser.set_defaults(port=64609)
-    parser.add_option("--logfile")
-    parser.add_option("--allow-shutdown", action="store_true")
-    parser.add_option("--port", type="int")
-    opts, rest = parser.parse_args()
-
-    HandlerClass.allow_shutdown = opts.allow_shutdown
-
-    setup_urllib2()
-
-    server_address = ('localhost', opts.port)
-
-    if opts.logfile:
-        sys.stderr = open(opts.logfile, "a", 0)
-
-    sys.stderr.write("[%s] server starting up\n" % log_date_time_string())
-
-    httpd = ServerClass(server_address, HandlerClass)
-
-    sys.stderr.write("[%s] starting worker thread\n" % log_date_time_string())
-    worker = threading.Thread(target = worker_thread)
-    worker.setDaemon(1)
-    worker.start()
-
-    print "Serving HTTP on port", opts.port, "..."
-    sys.stderr.write("[%s] serving HTTP on port %d\n"
-                     % (log_date_time_string(), opts.port))
-    httpd.serve_forever()
-    logmessage = "[%s] server stopped" % (log_date_time_string(),)
-    print logmessage
-    sys.stderr.write(logmessage + "\n")
-
-
-if __name__ == '__main__':
-    run_server()

Copied: trunk/COPYING (from rev 1, COPYING)

Copied: trunk/InteProxy.py (from rev 1, InteProxy.py)



More information about the Inteproxy-commits mailing list