Mercurial > p > roundup > code
view roundup/scripts/roundup_admin.py @ 6582:3e8f2104753b
issue2551186 - replace socket.sslerror in mailgw.py.
roundup/mailgw.py:
replaced socket.sslerror with anypy/ssl_.SSLError
also looks like a socket.sslerror was removed from pops handling.
added it back using method above.
roundupanypy/ssl_.py:
defines replacement SSLError suitable for python2 or 3
tested by running nc -lp 995 or 993 (pop3s/imaps) and sending
gibberish when mailgw connects. This generates a bad version number
SSLError.
I need to get my imap and pop mock servers included for testing at
some point, but I am not sure how to make them bind to the right port
as they are priv ports.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Tue, 04 Jan 2022 18:39:40 -0500 |
| parents | 1045b8eb0a3b |
| children | e929cc30e38c |
line wrap: on
line source
# Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/) # This module is free software, and you may redistribute it and/or modify # under the same terms as Python, so long as this copyright message and # disclaimer are retained in their original form. # # IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR # DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING # OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. """Command-line script stub that calls the roundup.admin functions. """ __docformat__ = 'restructuredtext' import sys # --- patch sys.path to make sure 'import roundup' finds correct version import os.path as osp thisdir = osp.dirname(osp.abspath(__file__)) rootdir = osp.dirname(osp.dirname(thisdir)) if (osp.exists(thisdir + '/__init__.py') and osp.exists(rootdir + '/roundup/__init__.py')): # the script is located inside roundup source code sys.path.insert(0, rootdir) # --/ # python version check from roundup import version_check # import the admin tool guts and make it go from roundup.admin import AdminTool from roundup.i18n import _ def run(): # time out after a minute if we can import socket if hasattr(socket, 'setdefaulttimeout'): socket.setdefaulttimeout(60) tool = AdminTool() sys.exit(tool.main()) if __name__ == '__main__': run() # vim: set filetype=python ts=4 sw=4 et si
