comparison farol/vulnerability.py @ 61:55b72057b066

Unify reference update/creation from forms
author Benoît Allard <benoit.allard@greenbone.net>
date Wed, 08 Oct 2014 12:06:50 +0200
parents c6e7175ff28c
children ce49bd1512dd
comparison
equal deleted inserted replaced
60:c6e7175ff28c 61:55b72057b066
30 CVRFReference, CVRFAcknowledgment, CVRFCWE, CVRFInvolvement, CVRFThreat, 30 CVRFReference, CVRFAcknowledgment, CVRFCWE, CVRFInvolvement, CVRFThreat,
31 CVRFProductStatus, CVRFCVSSSet, CVRFRemediation) 31 CVRFProductStatus, CVRFCVSSSet, CVRFRemediation)
32 from farolluz.renderer import utcnow 32 from farolluz.renderer import utcnow
33 33
34 from .controller import (update_note_from_request, create_note_from_request, 34 from .controller import (update_note_from_request, create_note_from_request,
35 update_reference_from_request, create_reference_from_request,
35 update_acknowledgment_from_request, create_acknowledgment_from_request) 36 update_acknowledgment_from_request, create_acknowledgment_from_request)
36 from .session import document_required, get_current 37 from .session import document_required, get_current
37 38
38 39
39 vulnerability = Blueprint('vulnerability', __name__) 40 vulnerability = Blueprint('vulnerability', __name__)
424 except IndexError: 425 except IndexError:
425 abort(404) 426 abort(404)
426 if request.method != 'POST': 427 if request.method != 'POST':
427 return render_template('vulnerability/edit_reference.j2', ordinal=ordinal, _type=reference._type, url=reference._url, description=reference._description, types=('',) + reference.TYPES) 428 return render_template('vulnerability/edit_reference.j2', ordinal=ordinal, _type=reference._type, url=reference._url, description=reference._description, types=('',) + reference.TYPES)
428 429
429 reference._type = request.form['type'] or None 430 update_reference_from_request(reference)
430 reference._url = request.form['url']
431 reference._description = request.form['description']
432 return redirect(url_for('.view', ordinal=ordinal)) 431 return redirect(url_for('.view', ordinal=ordinal))
433 432
434 @vulnerability.route('/<int:ordinal>/reference/add', methods=['GET', 'POST']) 433 @vulnerability.route('/<int:ordinal>/reference/add', methods=['GET', 'POST'])
435 @document_required 434 @document_required
436 def add_reference(ordinal): 435 def add_reference(ordinal):
437 if request.method != 'POST': 436 if request.method != 'POST':
438 return render_template('vulnerability/edit_reference.j2', action='Add', ordinal=ordinal, types=('',) + CVRFReference.TYPES) 437 return render_template('vulnerability/edit_reference.j2', action='Add', ordinal=ordinal, types=('',) + CVRFReference.TYPES)
439 438
440 ref = CVRFReference(request.form['url'], request.form['description'], request.form['type'] or None) 439 ref = create_reference_from_request()
441 get_vuln(ordinal).addReference(ref) 440 get_vuln(ordinal).addReference(ref)
442 return redirect(url_for('.view', ordinal=ordinal)) 441 return redirect(url_for('.view', ordinal=ordinal))
443 442
444 443
445 @vulnerability.route('/<int:ordinal>/acknowledgment/<int:index>') 444 @vulnerability.route('/<int:ordinal>/acknowledgment/<int:index>')

http://farol.wald.intevation.org