From b9ee2a673a27ba045ac031b94b7d1cc9196844cf Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 10 Apr 2017 02:41:23 -0700 Subject: add execution policy to pyramid request processing diagrams --- docs/_static/pyramid_request_processing.graffle | 244 ++++++++++++++++++------ docs/_static/pyramid_request_processing.png | Bin 130688 -> 135179 bytes docs/_static/pyramid_request_processing.svg | 2 +- 3 files changed, 184 insertions(+), 62 deletions(-) (limited to 'docs') diff --git a/docs/_static/pyramid_request_processing.graffle b/docs/_static/pyramid_request_processing.graffle index 56e4e13f2..5ccbf4ea4 100644 --- a/docs/_static/pyramid_request_processing.graffle +++ b/docs/_static/pyramid_request_processing.graffle @@ -58,9 +58,129 @@ 8 GraphicsList + + Class + LineGraphic + ControlPoints + + {0, 6.9840087890625} + {0, -9} + + FontInfo + + Color + + w + 0 + + Font + Helvetica + Size + 12 + + Head + + ID + 169378 + Info + 2 + + ID + 169517 + Layer + 0 + Points + + {155.00000381469727, 109.82143211364746} + {155.00000254313238, 133.68303707668386} + + Style + + stroke + + Bezier + + Color + + b + 0.0980392 + g + 0.0980392 + r + 0.0980392 + + HeadArrow + SharpArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 169516 + + + + Bounds + {{102.16667175292969, 87.276790618896484}, {105.66666412353516, 22.544641494750977}} + Class + ShapedGraphic + ID + 169516 + Layer + 0 + Magnets + + {0, 1} + {0, -1} + {1, 0} + {-1, 0} + + Shape + Rectangle + Style + + fill + + Color + + b + 0.999208 + g + 0.811343 + r + 0.644457 + + + shadow + + Draws + NO + ShadowVector + {2, 2} + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc + +\f0\fs20 \cf0 execution policy} + VerticalPad + 0 + + Bounds - {{238.74999618530273, 294.65604172230951}, {105.66668701171875, 18.656048080136394}} + {{238.74999618530273, 325.15604172230951}, {105.66668701171875, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -146,8 +266,8 @@ 0 Points - {154.9999760464211, 209.11365574251681} - {239.8333613077798, 209.14732074737549} + {154.99997604642331, 241.21656873817005} + {239.8333613077798, 240.64732074737549} Style @@ -182,7 +302,7 @@ Bounds - {{239.83336130777977, 197.875}, {105.66666412353516, 22.544641494750977}} + {{239.83336130777977, 229.375}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -259,8 +379,8 @@ 0 Points - {344.41668319702148, 411.88506673894034} - {375.5, 411.77232108797347} + {344.41668319702148, 442.38506673894034} + {375.5, 442.27232108797347} Style @@ -317,8 +437,8 @@ 0 Points - {155.00000254313238, 459.27667544230695} - {238.5002713470962, 456.52468399152298} + {155.00000254313238, 489.77667544230695} + {238.5002713470962, 487.02468399152298} Style @@ -377,8 +497,8 @@ 0 Points - {155.00000254313238, 482.12574895537085} - {238.52297468463752, 508.35839132916635} + {155.00000254313238, 512.6257489553708} + {238.52297468463752, 538.85839132916635} Style @@ -413,7 +533,7 @@ Bounds - {{238.74999618530273, 275.99999999999994}, {105.75002924601222, 18.656048080136394}} + {{238.74999618530273, 306.49999999999994}, {105.75002924601222, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -475,7 +595,7 @@ Bounds - {{238.74999618530273, 421.15071036499205}, {105.66668701171875, 18.656048080136394}} + {{238.74999618530273, 451.65071036499205}, {105.66668701171875, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -537,7 +657,7 @@ Bounds - {{238.74999618530273, 312.65604172230951}, {105.66668701171875, 18.656048080136394}} + {{238.74999618530273, 343.15604172230951}, {105.66668701171875, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -599,7 +719,7 @@ Bounds - {{238.74999618530273, 402.55704269887212}, {105.66668701171875, 18.656048080136394}} + {{238.74999618530273, 433.05704269887212}, {105.66668701171875, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -659,7 +779,7 @@ Bounds - {{238.74999618530273, 383.90099016834085}, {105.66668701171875, 18.656048080136394}} + {{238.74999618530273, 414.40099016834085}, {105.66668701171875, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -719,7 +839,7 @@ Bounds - {{238.74999618530273, 350.36561209044055}, {105.66668701171875, 33.089282989501953}} + {{238.74999618530273, 380.86561209044055}, {105.66668701171875, 33.089282989501953}} Class ShapedGraphic FontInfo @@ -779,7 +899,7 @@ Bounds - {{238.74999618530273, 331.26348241170439}, {105.66668701171875, 18.656048080136394}} + {{238.74999618530273, 361.76348241170439}, {105.66668701171875, 18.656048080136394}} Class ShapedGraphic FontInfo @@ -865,8 +985,8 @@ 0 Points - {155.00000254313238, 470.25295298442387} - {238.33861159880226, 482.4262543949045} + {155.00000254313238, 500.75295298442387} + {238.33861159880226, 512.9262543949045} Style @@ -901,7 +1021,7 @@ Bounds - {{238.83336130777977, 471.22620192028251}, {105.66666412353516, 22.544641494750977}} + {{238.83336130777977, 501.72620192028251}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -980,8 +1100,8 @@ 0 Points - {154.99998733539806, 128.68025330008533} - {239.83340199788393, 128.59152244387357} + {154.99998724282403, 165.00131810958592} + {239.83340199788393, 164.59152244387357} Style @@ -1016,7 +1136,7 @@ Bounds - {{239.83340199788395, 117.31920169649808}, {105.66666412353516, 22.544641494750977}} + {{239.83340199788395, 153.31920169649808}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -1074,7 +1194,7 @@ Bounds - {{102.1666056315114, 148.28868579864499}, {105.66669464111328, 33.08929443359375}} + {{102.1666056315114, 181.78868579864499}, {105.66669464111328, 33.08929443359375}} Class ShapedGraphic ID @@ -1125,7 +1245,7 @@ Bounds - {{102.1666056315114, 181.37798023223874}, {105.66669464111328, 17.244049072265625}} + {{102.1666056315114, 214.87798023223874}, {105.66669464111328, 17.244049072265625}} Class ShapedGraphic ID @@ -1193,7 +1313,7 @@ Bounds - {{102.16666158040482, 272}, {105.66666412353516, 33.08929443359375}} + {{102.16666158040482, 302.5}, {105.66666412353516, 33.08929443359375}} Class ShapedGraphic ID @@ -1244,7 +1364,7 @@ Bounds - {{102.16666158040482, 305.08929443359375}, {105.66666412353516, 17.244049072265625}} + {{102.16666158040482, 335.58929443359375}, {105.66666412353516, 17.244049072265625}} Class ShapedGraphic ID @@ -1321,8 +1441,8 @@ 0 Points - {238.74999618530282, 439.80675844512831} - {207.66666666666765, 385.656005859375} + {238.74999618530282, 470.30675844512831} + {207.66666666666765, 416.156005859375} Style @@ -1371,8 +1491,8 @@ 0 Points - {239.25039065750093, 276.57837549845181} - {207.66666666666777, 353.07514659563753} + {239.25039065750093, 307.07837549845181} + {207.66666666666777, 383.57514659563753} Style @@ -1436,8 +1556,8 @@ 0 Points - {155.00000254313238, 386.66442959065108} - {155.00000254313238, 422.21209462483216} + {155.00000254313238, 417.16442959065108} + {155.00000254313238, 452.71209462483216} Style @@ -1472,7 +1592,7 @@ Bounds - {{102.16667048136482, 353.07514659563753}, {105.66666412353516, 33.089282989501953}} + {{102.16667048136482, 383.57514659563753}, {105.66666412353516, 33.089282989501953}} Class ShapedGraphic ID @@ -1555,8 +1675,8 @@ 0 Points - {154.9999936421724, 258.44082431579938} - {238.8333613077798, 258.45536063967575} + {154.9999936421724, 288.94082431579938} + {238.8333613077798, 288.95536063967575} Style @@ -1969,7 +2089,7 @@ Bounds - {{375.5, 400.5}, {105.66666412353516, 22.544642175946908}} + {{375.5, 431}, {105.66666412353516, 22.544642175946908}} Class ShapedGraphic ID @@ -2053,8 +2173,8 @@ 0 Points - {155.00000170434049, 119.22767858295661} - {154.99995295206804, 148.28868579864499} + {155.00000157307935, 156.72767858475962} + {154.99995295206804, 181.78868579864499} Style @@ -2110,7 +2230,9 @@ Head ID - 169378 + 169516 + Info + 2 ID 169385 @@ -2119,7 +2241,7 @@ Points {155.00000254313238, 67.727678571434836} - {155.00000254313238, 96.18303707668386} + {155.00000381469727, 87.276790618896484} Style @@ -2156,7 +2278,7 @@ Bounds - {{102.16667048136482, 509.6179466247504}, {105.66666412353516, 22.544641494750977}} + {{102.16667048136482, 540.1179466247504}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2209,7 +2331,7 @@ Bounds - {{239, 497.23589324949899}, {105.66666412353516, 22.544641494750977}} + {{239, 527.73589324949899}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2262,7 +2384,7 @@ Bounds - {{239, 445.23589324949717}, {105.66666412353516, 22.544641494750977}} + {{239, 475.73589324949717}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2315,7 +2437,7 @@ Bounds - {{102.16667048136482, 422.21209462483216}, {105.66666412353516, 22.544641494750977}} + {{102.16667048136482, 452.71209462483216}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2368,7 +2490,7 @@ Bounds - {{238.83336130777977, 247.18303989230026}, {105.66666412353516, 22.544641494750977}} + {{238.83336130777977, 277.68303989230026}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2421,7 +2543,7 @@ Bounds - {{102.16667048136482, 222.18303707668389}, {105.66666412353516, 22.544641494750977}} + {{102.16667048136482, 252.68303707668389}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2474,7 +2596,7 @@ Bounds - {{102.16667048136482, 96.18303707668386}, {105.66666412353516, 22.544641494750977}} + {{102.16667048136482, 133.68303707668386}, {105.66666412353516, 22.544641494750977}} Class ShapedGraphic ID @@ -2609,8 +2731,8 @@ 0 Points - {154.99995295206804, 198.62202930450437} - {155.00000254313238, 222.18303707668389} + {154.99995295206804, 232.12202930450437} + {155.00000254313238, 252.68303707668389} Style @@ -2678,8 +2800,8 @@ 0 Points - {154.9999936421724, 245.22767856643924} - {154.9999936421724, 272} + {154.9999936421724, 275.72767856643924} + {154.9999936421724, 302.5} Style @@ -2743,8 +2865,8 @@ 0 Points - {154.9999936421724, 322.33334350585938} - {155.00000254313238, 353.07514659563753} + {154.9999936421724, 352.83334350585938} + {155.00000254313238, 383.57514659563753} Style @@ -2812,8 +2934,8 @@ 0 Points - {155.00000254313238, 444.75673611958314} - {155.00000254313238, 509.6179466247504} + {155.00000254313238, 475.25673611958314} + {155.00000254313238, 540.1179466247504} Style @@ -9868,7 +9990,7 @@ MasterSheets ModificationDate - 2016-04-13 08:32:47 +0000 + 2017-04-10 09:33:14 +0000 Modifier Steve Piercy NotesVisible @@ -9949,7 +10071,7 @@ Frame - {{35, 93}, {2284, 1325}} + {{35, 93}, {1632, 1325}} ListView OutlineWidth @@ -9963,15 +10085,15 @@ SidebarWidth 163 VisibleRegion - {{110.125, 77.875}, {239.125, 146.375}} + {{-27, 33.5}, {630.5, 593}} Zoom - 8 + 2 ZoomValues Request Processing + 2 8 - 4 diff --git a/docs/_static/pyramid_request_processing.png b/docs/_static/pyramid_request_processing.png index 2f44f4824..d62b172b0 100644 Binary files a/docs/_static/pyramid_request_processing.png and b/docs/_static/pyramid_request_processing.png differ diff --git a/docs/_static/pyramid_request_processing.svg b/docs/_static/pyramid_request_processing.svg index 03f6d56fa..38fa7348d 100644 --- a/docs/_static/pyramid_request_processing.svg +++ b/docs/_static/pyramid_request_processing.svg @@ -1,3 +1,3 @@ -2016-04-13 08:32ZRequest Processingno exceptionsmiddleware ingress tween ingresstraversalContextFoundtween egressresponse callbacksfinished callbacksmiddleware egressBeforeRenderRequest ProcessingLegendeventcallbackview deriverexternal process (middleware, tween)internal processview pipelinepredicatesview lookuproute predicatesURL dispatchNewRequestNewResponseview mapper ingressviewview mapper egressresponse adapterdecorators ingressdecorators egressauthorizationBeforeTraversalCSRF checks +2017-04-10 09:33ZRequest Processingno exceptionsmiddleware ingress tween ingresstraversalContextFoundtween egressresponse callbacksfinished callbacksmiddleware egressBeforeRenderRequest ProcessingLegendeventcallbackview deriverexternal process (middleware, tween)internal processview pipelinepredicatesview lookuproute predicatesURL dispatchNewRequestNewResponseview mapper ingressviewview mapper egressresponse adapterdecorators ingressdecorators egressauthorizationBeforeTraversalCSRF checksexecution policy -- cgit v1.2.3 From 66585f47e2ccd36be6a3cd5679ccf60161d9db05 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 12 Apr 2017 22:37:56 -0500 Subject: forward port some history changes from 1.8-branch --- docs/whatsnew-1.8.rst | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs') diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst index adc60b34b..ff16c1a4b 100644 --- a/docs/whatsnew-1.8.rst +++ b/docs/whatsnew-1.8.rst @@ -114,6 +114,13 @@ Minor Feature Additions later calls to place translation directories at a higher priority then earlier calls. See https://github.com/Pylons/pyramid/pull/2902 +- Added a new ``callback`` option to + :meth:`pyramid.config.Configurator.set_default_csrf_options`` which + can be used to determine per-request whether CSRF checking should be enabled + to allow for a mix authentication methods. Only cookie-based methods + generally require CSRF checking. + See https://github.com/Pylons/pyramid/pull/2778 + Backwards Incompatibilities --------------------------- -- cgit v1.2.3