Merge branch 'feature/#288-tactic-links' into release/website-v3.3.0

Author: idavila

modules/techniques/techniques.py

@@ -235,7 +235,13 @@ def generate_data_for_md(technique_dict, technique, tactic_list, is_sub_techniqu
             if technique.get('kill_chain_phases'):
                 technique_dict['tactics'] = []
                 for elem in technique['kill_chain_phases']:
-                    technique_dict['tactics'].append(elem['phase_name'].title().replace('-', ' '))
+                    # Get tactic from tactic_list
+                    tactic = [x for x in tactic_list if x['x_mitre_shortname'] == elem['phase_name']][0]
+                    tactic_info = {
+                        "name" : tactic['name'],
+                        "id" : util.buildhelpers.get_attack_id(tactic)
+                    }
+                    technique_dict['tactics'].append(tactic_info)
 
             # Get platforms that technique uses
             if technique.get('x_mitre_platforms'):

modules/techniques/templates/technique.html

@@ -184,7 +184,7 @@ <h5 class="mb-0" id ="sub-techniques">Sub-techniques ({{parsed.subtechniques|len
                                                 <div class="col-md-11 pl-0">
                                                     <span class="h5 card-title">{{"Tactic" if parsed.tactics | length < 2 else "Tactics"}}:</span>
                                                     {% for tactic in parsed.tactics %}
-                                                        {{tactic}}{% if not loop.last %},{% endif %}
+                                                        <a href="/tactics/{{tactic.id}}">{{tactic.name}}</a>{% if not loop.last %},{% endif %}
                                                     {% endfor %}
                                                 </div>
                                             </div>