Merge branch 'master' into consolidate-version-string

This commit is contained in:
2018-07-04 11:07:01 -04:00
committed by GitHub
7 changed files with 326 additions and 62 deletions
+1
View File
@@ -0,0 +1 @@
Dockerfile
+1
View File
@@ -7,3 +7,4 @@ dist/
.tox
*.egg-info
*.swp
.vscode/
+5
View File
@@ -1,5 +1,10 @@
FROM ubuntu:18.04
LABEL name="httpbin"
LABEL version="0.9.0"
LABEL description="A simple HTTP service."
LABEL org.kennethreitz.vendor="Kenneth Reitz"
RUN apt update -y && apt install python3-pip -y
EXPOSE 80
+1 -1
View File
@@ -1,3 +1,3 @@
include httpbin/VERSION README.rst LICENSE AUTHORS requirements.txt test_httpbin.py
include httpbin/VERSION README.md LICENSE AUTHORS test_httpbin.py
recursive-include httpbin/templates *
recursive-include httpbin/static *
+73 -7
View File
@@ -58,6 +58,7 @@ tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
app = Flask(__name__, template_folder=tmpl_dir)
app.debug = bool(os.environ.get('DEBUG'))
app.config['JSONIFY_PRETTYPRINT_REGULAR'] = True
app.add_template_global('HTTPBIN_TRACKING' in os.environ, name='tracking_enabled')
@@ -86,8 +87,7 @@ template = {
"host": "httpbin.org", # overrides localhost:5000
"basePath": "/", # base bash for blueprint registration
"schemes": [
"https",
"http"
"https"
],
'protocol': 'https',
'tags': [
@@ -513,17 +513,58 @@ def redirect_to():
- Redirects
produces:
- text/html
get:
parameters:
- name: url
- in: query
name: url
type: string
- name: status_code
required: true
- in: query
name: status_code
type: int
post:
consumes:
- application/x-www-form-urlencoded
parameters:
- in: formData
name: url
type: string
required: true
- in: formData
name: status_code
type: int
required: false
patch:
consumes:
- application/x-www-form-urlencoded
parameters:
- in: formData
name: url
type: string
required: true
- in: formData
name: status_code
type: int
required: false
put:
consumes:
- application/x-www-form-urlencoded
parameters:
- in: formData
name: url
type: string
required: true
- in: formData
name: status_code
type: int
required: false
responses:
302:
description: A redirection.
"""
args = CaseInsensitiveDict(request.args.items())
argsDict = request.form.to_dict(flat=True) if request.method in ('POST', 'PATCH', 'PUT') else request.args.items()
args = CaseInsensitiveDict(argsDict)
# We need to build the response manually and convert to UTF-8 to prevent
# werkzeug from "fixing" the URL. This endpoint should set the Location
@@ -1075,7 +1116,7 @@ def digest_auth(qop=None, user='user', passwd='passwd', algorithm='MD5', stale_a
return response
@app.route('/delay/<delay>')
@app.route('/delay/<delay>', methods=['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'TRACE'])
def delay_response(delay):
""""Returns a delayed response (max of 10 seconds).
---
@@ -1105,6 +1146,31 @@ def drip():
---
tags:
- Dynamic data
parameters:
- in: query
name: duration
type: number
description: The amount of time (in seconds) over which to drip each byte
default: 2
required: false
- in: query
name: numbytes
type: integer
description: The number of bytes to respond with
default: 10
required: false
- in: query
name: code
type: integer
description: The response code that will be returned
default: 200
required: false
- in: query
name: delay
type: number
description: The amount of time (in seconds) to delay before responding
default: 2
required: false
produces:
- application/octet-stream
responses:
@@ -1127,7 +1193,7 @@ def drip():
pause = duration / numbytes
def generate_bytes():
for i in xrange(numbytes):
yield u"*".encode('utf-8')
yield b"*"
time.sleep(pause)
response = Response(generate_bytes(), headers={
+228 -47
View File
@@ -1,70 +1,251 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv='content-type' value='text/html;charset=utf8'>
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
<title>httpbin(1): HTTP Client Testing Service</title>
<style type='text/css' media='all'>
/* style: man */
body#manpage {margin:0}
.mp {max-width:100ex;padding:0 9ex 1ex 4ex}
.mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
.mp h2 {margin:10px 0 0 0}
.mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
.mp h3 {margin:0 0 0 4ex}
.mp dt {margin:0;clear:left}
.mp dt.flush {float:left;width:8ex}
.mp dd {margin:0 0 0 9ex}
.mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
.mp pre {margin-bottom:20px}
.mp pre+h2,.mp pre+h3 {margin-top:22px}
.mp h2+pre,.mp h3+pre {margin-top:5px}
.mp img {display:block;margin:auto}
.mp h1.man-title {display:none}
.mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
.mp h2 {font-size:16px;line-height:1.25}
.mp h1 {font-size:20px;line-height:2}
.mp {text-align:justify;background:#fff}
.mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
.mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
.mp u {text-decoration:underline}
.mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
.mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
.mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
.mp b.man-ref {font-weight:normal;color:#434241}
.mp pre {padding:0 4ex}
.mp pre code {font-weight:normal;color:#434241}
.mp h2+pre,h3+pre {padding-left:0}
ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
ol.man-decor {width:100%}
ol.man-decor li.tl {text-align:left}
ol.man-decor li.tc {text-align:center;letter-spacing:4px}
ol.man-decor li.tr {text-align:right;float:right}
body#manpage {
margin: 0;
}
.mp {
max-width: 100ex;
padding: 0 9ex 1ex 4ex;
}
.mp p,
.mp pre,
.mp ul,
.mp ol,
.mp dl {
margin: 0 0 20px 0;
}
.mp h2 {
margin: 10px 0 0 0;
}
.mp>p,
.mp>pre,
.mp>ul,
.mp>ol,
.mp>dl {
margin-left: 8ex;
}
.mp h3 {
margin: 0 0 0 4ex;
}
.mp dt {
margin: 0;
clear: left;
}
.mp dt.flush {
float: left;
width: 8ex;
}
.mp dd {
margin: 0 0 0 9ex;
}
.mp h1,
.mp h2,
.mp h3,
.mp h4 {
clear: left;
}
.mp pre {
margin-bottom: 20px;
}
.mp pre+h2,
.mp pre+h3 {
margin-top: 22px;
}
.mp h2+pre,
.mp h3+pre {
margin-top: 5px;
}
.mp img {
display: block;
margin: auto;
}
.mp h1.man-title {
display: none;
}
.mp,
.mp code,
.mp pre,
.mp tt,
.mp kbd,
.mp samp,
.mp h3,
.mp h4 {
font-family: monospace;
font-size: 14px;
line-height: 1.42857142857143;
}
.mp h2 {
font-size: 16px;
line-height: 1.25;
}
.mp h1 {
font-size: 20px;
line-height: 2;
}
.mp {
text-align: justify;
background: #fff;
}
.mp,
.mp code,
.mp pre,
.mp pre code,
.mp tt,
.mp kbd,
.mp samp {
color: #131211;
}
.mp h1,
.mp h2,
.mp h3,
.mp h4 {
color: #030201;
}
.mp u {
text-decoration: underline;
}
.mp code,
.mp strong,
.mp b {
font-weight: bold;
color: #131211;
}
.mp em,
.mp var {
font-style: italic;
color: #232221;
text-decoration: none;
}
.mp a,
.mp a:link,
.mp a:hover,
.mp a code,
.mp a pre,
.mp a tt,
.mp a kbd,
.mp a samp {
color: #0000ff;
}
.mp b.man-ref {
font-weight: normal;
color: #434241;
}
.mp pre {
padding: 0 4ex;
}
.mp pre code {
font-weight: normal;
color: #434241;
}
.mp h2+pre,
h3+pre {
padding-left: 0;
}
ol.man-decor,
ol.man-decor li {
margin: 3px 0 10px 0;
padding: 0;
float: left;
width: 33%;
list-style-type: none;
text-transform: uppercase;
color: #999;
letter-spacing: 1px;
}
ol.man-decor {
width: 100%;
}
ol.man-decor li.tl {
text-align: left;
}
ol.man-decor li.tc {
text-align: center;
letter-spacing: 4px;
}
ol.man-decor li.tr {
text-align: right;
float: right;
}
</style>
<style type='text/css' media='all'>
/* style: 80c */
.mp {max-width:86ex}
ul {list-style: None; margin-left: 1em!important}
.man-navigation {left:101ex}
.mp {
max-width: 86ex
}
ul {
list-style: None;
margin-left: 1em !important
}
.man-navigation {
left: 101ex
}
.scheme-container {
display: none !important;
}
</style>
</head>
<body id='manpage'>
<a href="https://github.com/requests/httpbin" class="github-corner" aria-label="View source on Github">
<svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true">
<a href="https://github.com/requests/httpbin" class="github-corner" aria-label="View source on Github">
<svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;"
aria-hidden="true">
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
<path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
<path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
<path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
<path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
fill="currentColor" class="octo-body"></path>
</svg>
</a>
</a>
{% include 'httpbin.1.html' %}
{% if tracking_enabled %}
{% include 'trackingscripts.html' %}
{% endif %}
{% include 'httpbin.1.html' %} {% if tracking_enabled %} {% include 'trackingscripts.html' %} {% endif %}
</body>
</html>
+10
View File
@@ -0,0 +1,10 @@
{
"name": "httpbin",
"regions": [
"all"
],
"alias": [
"httpbin.org"
],
"type": "docker"
}