Skip to content

Commit

Permalink
gateone.core.utils: Switched from using sys.maxint to sys.maxsize
Browse files Browse the repository at this point in the history
… so that generating self-signed SSL certificates works with Python 3.

gateone.core.server:  Fixed a missing .format() call in a log message when SSL certificate auto-generation fails.
gateone/docs: Rebuilt the documentation
  • Loading branch information
liftoff committed Jun 18, 2016
1 parent 2994407 commit f87f3e6
Show file tree
Hide file tree
Showing 162 changed files with 19,308 additions and 39,191 deletions.
2 changes: 1 addition & 1 deletion gateone/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
__version_info__ = (1, 2, 0)
__license__ = "AGPLv3" # ...or proprietary (see LICENSE.txt)
__author__ = 'Dan McDougall <[email protected]>'
__commit__ = "20160520192647" # Gets replaced by git (holds the date/time)
__commit__ = "20160603215357" # Gets replaced by git (holds the date/time)

import os
GATEONE_DIR = os.path.dirname(os.path.abspath(__file__))
Expand Down
5 changes: 1 addition & 4 deletions gateone/applications/terminal/app_terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1310,10 +1310,7 @@ def stop_capture(self, term):
to the client via the 'terminal:captured_data' WebSocket action which
will included a dict like so::
{
"term": 1,
"data": "$ ls\nfile1 file2\n$ "
}
{"term": 1, "data": "$ ls\nfile1 file2\n$ " }
"""
self.term_log.debug("stop_capture(%s)" % term)
if term not in self.loc_terms:
Expand Down
5 changes: 3 additions & 2 deletions gateone/core/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
}
__author__ = 'Dan McDougall <[email protected]>'
__commit__ = "20160520192647" # Gets replaced by git (holds the date/time)
__commit__ = "20160603215357" # Gets replaced by git (holds the date/time)

# NOTE: Docstring includes reStructuredText markup for use with Sphinx.
__doc__ = '''\
Expand Down Expand Up @@ -4375,7 +4375,8 @@ def main(installed=True):
except OSError as e:
logging.error(_(
"Gate One could not create {ssl_base} ({e}). "
"Are you using the correct --settings_dir?"))
"Are you using the correct --settings_dir?").format(
ssl_base=ssl_base, e=e))
sys.exit(1)
logging.info(_("No SSL private key found. One will be generated."))
gen_self_signed_ssl(path=ssl_base)
Expand Down
2 changes: 1 addition & 1 deletion gateone/core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ def gen_self_signed_pyopenssl(notAfter=None, path=None):
f.write(OpenSSL.crypto.dump_privatekey(
OpenSSL.crypto.FILETYPE_PEM, pkey))
cert = OpenSSL.crypto.X509()
cert.set_serial_number(random.randint(0, sys.maxint))
cert.set_serial_number(random.randint(0, sys.maxsize))
cert.gmtime_adj_notBefore(0)
if notAfter:
cert.gmtime_adj_notAfter(notAfter)
Expand Down
Binary file modified gateone/docs/build/doctrees/About/configuration.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/About/index.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/About/installation.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/About/licensing.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/About/prerequisites.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Applications/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Applications/terminal/index.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Applications/terminal/userguide.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Applications/terminal/woff_info.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/authentication.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/authorization.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/ctypes_pam.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/embedding.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/embedding_api_auth.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/embedding_chapter1.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/index.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/js_gateone.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/js_go_process.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/log.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/logviewer.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/pam.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/plugin_help.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/server.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/sso.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/terminal.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/termio.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/Developer/utils.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/ReleaseNotes/index.doctree
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/environment.pickle
Binary file not shown.
Binary file modified gateone/docs/build/doctrees/index.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion gateone/docs/build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: dc6abf77b893a7cbf5cea7c36300a13d
config: 944484138231e99f7e2c37949c988bbb
tags: 645f666f9bcd5a90fca523b33c5a78b7
276 changes: 143 additions & 133 deletions gateone/docs/build/html/About/configuration.html

Large diffs are not rendered by default.

47 changes: 30 additions & 17 deletions gateone/docs/build/html/About/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-29645087-2']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<title>About Gate One &mdash; Gate One 1.2.0 documentation</title>

<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/classic.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/ansi.css" type="text/css" />

Expand All @@ -29,8 +40,8 @@
<link rel="next" title="Licensing" href="licensing.html" />
<link rel="prev" title="Gate One Documentation" href="../index.html" />
</head>
<body>
<div class="related">
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
Expand All @@ -45,14 +56,14 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../index.html" title="Gate One Documentation"
accesskey="P">previous</a> |</li>
<li><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="../index.html">Gate One Documentation</a> &raquo;</li>
</ul>
</div>

<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body">
<div class="body" role="main">

<div class="section" id="about-gate-one">
<h1>About Gate One<a class="headerlink" href="#about-gate-one" title="Permalink to this headline"></a></h1>
Expand Down Expand Up @@ -141,7 +152,7 @@ <h1>About Gate One<a class="headerlink" href="#about-gate-one" title="Permalink
</div>
</div>
</div>
<div class="sphinxsidebar">
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<p class="logo"><a href="../index.html">
<img class="logo" src="../_static/ls_logo_1inch_300dpi.png" alt="Logo"/>
Expand All @@ -152,12 +163,14 @@ <h4>Previous topic</h4>
<h4>Next topic</h4>
<p class="topless"><a href="licensing.html"
title="next chapter">Licensing</a></p>
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/About/index.txt"
rel="nofollow">Show Source</a></li>
</ul>
<div id="searchbox" style="display: none">
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/About/index.txt"
rel="nofollow">Show Source</a></li>
</ul>
</div>
<div id="searchbox" style="display: none" role="search">
<h3>Quick search</h3>
<form class="search" action="../search.html" method="get">
<input type="text" name="q" />
Expand All @@ -174,7 +187,7 @@ <h3>Quick search</h3>
</div>
<div class="clearer"></div>
</div>
<div class="related">
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
Expand All @@ -189,13 +202,13 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../index.html" title="Gate One Documentation"
>previous</a> |</li>
<li><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="../index.html">Gate One Documentation</a> &raquo;</li>
</ul>
</div>

<div class="footer">
<div class="footer" role="contentinfo">
&copy; Copyright 2014, Liftoff Software Corporation.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.6.
</div>
<script type="text/javascript">
window.onload = function(e) {
Expand Down
53 changes: 33 additions & 20 deletions gateone/docs/build/html/About/installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-29645087-2']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<title>Installation &mdash; Gate One 1.2.0 documentation</title>

<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/classic.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/ansi.css" type="text/css" />

Expand All @@ -30,8 +41,8 @@
<link rel="next" title="Configuration" href="configuration.html" />
<link rel="prev" title="Prerequisites" href="prerequisites.html" />
</head>
<body>
<div class="related">
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
Expand All @@ -46,15 +57,15 @@ <h3>Navigation</h3>
<li class="right" >
<a href="prerequisites.html" title="Prerequisites"
accesskey="P">previous</a> |</li>
<li><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li><a href="index.html" accesskey="U">About Gate One</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="index.html" accesskey="U">About Gate One</a> &raquo;</li>
</ul>
</div>

<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body">
<div class="body" role="main">

<div class="section" id="installation">
<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline"></a></h1>
Expand All @@ -79,7 +90,7 @@ <h2>From Source<a class="headerlink" href="#from-source" title="Permalink to thi
<p>This translates to: Extract; Change into the gateone* directory; Install.</p>
<div class="admonition tip">
<p class="first admonition-title">Tip</p>
<p class="last">You can make your own RPM from the source tarball by executing <tt class="docutils literal"><span class="pre">sudo</span> <span class="pre">python</span> <span class="pre">setup.py</span> <span class="pre">bdist_rpm</span></tt> instead of <tt class="docutils literal"><span class="pre">sudo</span> <span class="pre">python</span> <span class="pre">setup.py</span> <span class="pre">install</span></tt>.</p>
<p class="last">You can make your own RPM from the source tarball by executing <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">python</span> <span class="pre">setup.py</span> <span class="pre">bdist_rpm</span></code> instead of <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">python</span> <span class="pre">setup.py</span> <span class="pre">install</span></code>.</p>
</div>
</div>
</div>
Expand All @@ -88,7 +99,7 @@ <h2>From Source<a class="headerlink" href="#from-source" title="Permalink to thi
</div>
</div>
</div>
<div class="sphinxsidebar">
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<p class="logo"><a href="../index.html">
<img class="logo" src="../_static/ls_logo_1inch_300dpi.png" alt="Logo"/>
Expand All @@ -109,12 +120,14 @@ <h4>Previous topic</h4>
<h4>Next topic</h4>
<p class="topless"><a href="configuration.html"
title="next chapter">Configuration</a></p>
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/About/installation.txt"
rel="nofollow">Show Source</a></li>
</ul>
<div id="searchbox" style="display: none">
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/About/installation.txt"
rel="nofollow">Show Source</a></li>
</ul>
</div>
<div id="searchbox" style="display: none" role="search">
<h3>Quick search</h3>
<form class="search" action="../search.html" method="get">
<input type="text" name="q" />
Expand All @@ -131,7 +144,7 @@ <h3>Quick search</h3>
</div>
<div class="clearer"></div>
</div>
<div class="related">
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
Expand All @@ -146,14 +159,14 @@ <h3>Navigation</h3>
<li class="right" >
<a href="prerequisites.html" title="Prerequisites"
>previous</a> |</li>
<li><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li><a href="index.html" >About Gate One</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="index.html" >About Gate One</a> &raquo;</li>
</ul>
</div>

<div class="footer">
<div class="footer" role="contentinfo">
&copy; Copyright 2014, Liftoff Software Corporation.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.6.
</div>
<script type="text/javascript">
window.onload = function(e) {
Expand Down
51 changes: 32 additions & 19 deletions gateone/docs/build/html/About/licensing.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-29645087-2']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<title>Licensing &mdash; Gate One 1.2.0 documentation</title>

<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/classic.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/ansi.css" type="text/css" />

Expand All @@ -30,8 +41,8 @@
<link rel="next" title="Prerequisites" href="prerequisites.html" />
<link rel="prev" title="About Gate One" href="index.html" />
</head>
<body>
<div class="related">
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
Expand All @@ -46,15 +57,15 @@ <h3>Navigation</h3>
<li class="right" >
<a href="index.html" title="About Gate One"
accesskey="P">previous</a> |</li>
<li><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li><a href="index.html" accesskey="U">About Gate One</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="index.html" accesskey="U">About Gate One</a> &raquo;</li>
</ul>
</div>

<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body">
<div class="body" role="main">

<div class="section" id="licensing">
<h1>Licensing<a class="headerlink" href="#licensing" title="Permalink to this headline"></a></h1>
Expand Down Expand Up @@ -108,7 +119,7 @@ <h2>Gate One Commercial Licensing<a class="headerlink" href="#gate-one-commercia
</div>
</div>
</div>
<div class="sphinxsidebar">
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<p class="logo"><a href="../index.html">
<img class="logo" src="../_static/ls_logo_1inch_300dpi.png" alt="Logo"/>
Expand All @@ -128,12 +139,14 @@ <h4>Previous topic</h4>
<h4>Next topic</h4>
<p class="topless"><a href="prerequisites.html"
title="next chapter">Prerequisites</a></p>
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/About/licensing.txt"
rel="nofollow">Show Source</a></li>
</ul>
<div id="searchbox" style="display: none">
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/About/licensing.txt"
rel="nofollow">Show Source</a></li>
</ul>
</div>
<div id="searchbox" style="display: none" role="search">
<h3>Quick search</h3>
<form class="search" action="../search.html" method="get">
<input type="text" name="q" />
Expand All @@ -150,7 +163,7 @@ <h3>Quick search</h3>
</div>
<div class="clearer"></div>
</div>
<div class="related">
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
Expand All @@ -165,14 +178,14 @@ <h3>Navigation</h3>
<li class="right" >
<a href="index.html" title="About Gate One"
>previous</a> |</li>
<li><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li><a href="index.html" >About Gate One</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="../index.html">Gate One Documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="index.html" >About Gate One</a> &raquo;</li>
</ul>
</div>

<div class="footer">
<div class="footer" role="contentinfo">
&copy; Copyright 2014, Liftoff Software Corporation.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.6.
</div>
<script type="text/javascript">
window.onload = function(e) {
Expand Down
Loading

0 comments on commit f87f3e6

Please sign in to comment.