External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

stop various async background requests from bumping the session expiry

Browse Source 
if a user has an active session that just sits on the dashboard or job
list, websocket messages that come in (for e.g., job status changes)
will trigger AJAX requests for more data; this process causes a user
with an idle login to continue to generate API requests, which in turn
ticks their expiry timer.  As a result, users with active sessions
sitting on these two (popular) pages will never be automatically logged
out via SESSION_MAX_AGE.

this change introduces a special header that the UI can use to signify
that a request shouldn't bump the expiry timer
This commit is contained in:
Ryan Petrello 2018-11-15 11:45:11 -05:00
parent 2758a38485
commit c2660af60d
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/middleware.py
View File

@ -126,8 +126,9 @@ class SessionTimeoutMiddleware(object):
"""
def process_response(self, request, response):
should_skip = 'HTTP_X_WS_SESSION_QUIET' in request.META
req_session = getattr(request, 'session', None)
if req_session and not req_session.is_empty():
if req_session and not req_session.is_empty() and should_skip is False:
expiry = int(settings.SESSION_COOKIE_AGE)
request.session.set_expiry(expiry)
response['Session-Timeout'] = expiry

2
awx/ui/client/features/jobs/jobsList.controller.js
View File

@ -207,7 +207,7 @@ function ListJobsController (
};
function refreshJobs () {
qs.search(SearchBasePath, $state.params.job_search)
qs.search(SearchBasePath, $state.params.job_search, { 'X-WS-Session-Quiet': true })
.then(({ data }) => {
vm.jobs = data.results;
vm.job_dataset = data;

2
awx/ui/client/features/templates/templatesList.controller.js
View File

@ -199,7 +199,7 @@ function ListTemplatesController(
function refreshTemplates() {
Wait('start');
let path = GetBasePath('unified_job_templates');
qs.search(path, $state.params.template_search)
qs.search(path, $state.params.template_search, { 'X-WS-Session-Quiet': true })
.then(function(searchResponse) {
vm.dataset = searchResponse.data;
vm.templates = vm.dataset.results;

5
awx/ui/client/lib/models/Base.js
View File

@ -62,10 +62,11 @@ function requestWithCache (config) {
* @yields {boolean} - Indicating a match has been found. If so, the results
* are set on the model.
*/
function search (params = {}, config = {}) {
function search (params = {}, config = {}, headers = {}) {
const req = {
method: 'GET',
url: this.path
url: this.path,
headers
};
if (typeof params === 'string') {

1
awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.service.js
View File

@ -36,6 +36,7 @@ function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope, $q) {
return;
}
url = dash_path + 'graphs/jobs/?period='+period+'&job_type='+jobType;
Rest.setHeader({'X-WS-Session-Quiet': true});
Rest.setUrl(url);
var result = Rest.get()
.catch(function(response) {

2
awx/ui/client/src/home/home.controller.js
View File

@ -87,6 +87,7 @@ export default ['$scope', '$rootScope','Wait',
ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard: ' + status });
});
Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job");
Rest.setHeader({'X-WS-Session-Quiet': true});
Rest.get()
.then(({data}) => {
data = data.results;
@ -119,6 +120,7 @@ export default ['$scope', '$rootScope','Wait',
});
Rest.setUrl(GetBasePath("unified_jobs") + "?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job");
Rest.setHeader({'X-WS-Session-Quiet': true});
Rest.get()
.then(({data}) => {
$scope.dashboardJobsListData = data.results;