Created
December 10, 2021 01:11
-
-
Save cfm/65e57513b526db16741dbffd2e2aee7e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!DOCTYPE html> | |
| <html lang="en"> | |
| <head> | |
| <meta charset="utf-8" /> | |
| <meta http-equiv="x-ua-compatible" content="IE=edge"> | |
| <meta name="referrer" content="no-referrer" /> | |
| <meta name="generator" content="diffoscope" /> | |
| <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAADdgAAA3YBfdWCzAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAM8SURBVFiF7dZdaJZlGAfw3/O+e9XNjy3XllZzWImBxIpifqTgsmUHBSIeBNFBdRh0UHQ0xGdb66CFBIERZEFRQRRUw0HkQkLMYQSBdpCFWdgSP6jpNn2393k68Nn2bj3vXtb6UOh/cl/39b/u67mem/913zf/4z9GUDw5xNI8n5WIzW9m/QF2YluJmI8203mALzEvLWAerRs4Pz6vSIkZSlsYk0/GkaB0zEgyDgWMlijyWsJuS2fkQwu8pqpMTA0ypeiShG71Bp0rU8Q+A47MWEDgvHZbZl/Av4SpIgxVYB3IqwZDmoUuYkzosDaNchpAoFqkSmgjGPWzLieF1k3JHVsjvCJQHBYaSy9g1E3m+QImQiK9SbNGqJDzuiDZ0lggQJCsyelDq8BB47sbCWTsnvhG3kqcLL833eqF4hk1EOoTOjZjnnaRdq2l6KtMAyl4/g23bKJrun+Mt9uOq7nvqOVbebWYy9Adc1fM/R/3CO780dONbIeFPHsPw+ULeM5ZHTbXHfUtXpxOZzgT5z02UGsZThRzF/ilht9G+fr4zfbfccIxXIa7uVTup69i7LJXaEEqF3on1d9ludBLpVLOVoT1lky9QYtwQ6p3WAVqSyUslWwSbRrkPJrMtgn0iBVk7BPJ4sGE24EPQKW3jLgdzWKLBTbg0yTuZeGkDsp2gcUGDesHGQ/gK5G8nLMigWiCe3jCrnTRiJ9EYjm1ImsUEq5l8hScPXbpsVtlKhfan+pv0yD0ZqmU5XegGBmnDIo/pylj8oYLOP3Eab/v5Zmi6EtZ3vv1FU/2r7LioYSL2dNybbdiMdptFU57++20Vqh+iq/Tap1WpaWY611wmyWyUzxZDbIWTvEV1Ildn5agfBumoUMTtoisFvhebAAHZWxX0ChwTuScvHdVeVykToysMyJ7ittwbmj31J+6IrRDp5XTfBt1WJ+WYnZdMB0F3xlUgD5uDVj2Sa+a4SrzH+FeyHHmw17V112waBOZgP4WczkLZsILar1fpIliMU4XZoK/poE0XHl+N8v6QcGAUbVymnDIZVnzrTXqGzmnhKLxZX/niyiDjIJgwg4Se1GR/Y8idGPysh6fr0i1i/AHMWHgrwUJgNAAAAAASUVORK5CYII=" /> | |
| <title>/usr/local/Cellar/diffoscope/194/libexec/bin/diffoscope header-updates.patch header-updates-rebased-theirs.patch --html header-updates.html</title> | |
| <style> | |
| body.diffoscope { | |
| background: white; | |
| color: black; | |
| } | |
| .diffoscope .footer { | |
| font-size: small; | |
| } | |
| .diffoscope .difference { | |
| border: outset #888 1px; | |
| background: #E8E8E8; | |
| background: rgba(0,0,0,.1); | |
| padding: 0.5em; | |
| margin: 0.5em 0; | |
| } | |
| .diffoscope .difference table { | |
| table-layout: fixed; | |
| width: 100%; | |
| border: 0; | |
| } | |
| .diffoscope .difference th, | |
| .diffoscope .difference td { | |
| border: 0; | |
| } | |
| .diffoscope table.diff { | |
| border: 0; | |
| border-collapse:collapse; | |
| font-size:0.75em; | |
| font-family: 'Lucida Console', monospace; | |
| word-break: break-word; | |
| } | |
| .diffoscope table.diff tr:hover td { | |
| background: #FFFF00; | |
| } | |
| .diffoscope .line { | |
| color:#8080a0 | |
| } | |
| .diffoscope th { | |
| background: black; | |
| color: white | |
| } | |
| .diffoscope .diffunmodified td { | |
| background: #D0D0E0 | |
| } | |
| .diffoscope .diffhunk td { | |
| background: #A0A0A0 | |
| } | |
| .diffoscope .diffadded td { | |
| background: #CCFFCC | |
| } | |
| .diffoscope .diffdeleted td { | |
| background: #FFCCCC | |
| } | |
| .diffoscope .diffchanged td { | |
| background: #FFFFA0 | |
| } | |
| .diffoscope ins, del { | |
| background: #E0C880; | |
| text-decoration: none | |
| } | |
| .diffoscope .dp { | |
| color: #B08080 | |
| } | |
| .diffoscope .comment { | |
| font-style: italic; | |
| } | |
| .diffoscope .comment.multiline { | |
| font-style: normal; | |
| font-family: monospace; | |
| white-space: pre; | |
| } | |
| .diffoscope .source { | |
| font-weight: bold; | |
| } | |
| .diffoscope .error { | |
| border: solid black 1px; | |
| background: red; | |
| color: white; | |
| padding: 0.2em; | |
| } | |
| .diffoscope .anchor { | |
| margin-left: 0.5em; | |
| font-size: 80%; | |
| color: #333; | |
| text-decoration: none; | |
| display: none; | |
| } | |
| .diffoscope .diffheader:hover .anchor { | |
| display: inline; | |
| } | |
| .diffoscope .diffcontrol, .diffoscope .diffcontrol-nochildren { | |
| float: left; | |
| margin-right: 0.3em; | |
| cursor: pointer; | |
| display: none; /* currently, only available in html-dir output where jquery is enabled */ | |
| } | |
| .diffoscope .colines { | |
| width: 3em; | |
| } | |
| .diffoscope .coldiff { | |
| width: 99%; | |
| } | |
| .diffoscope .diffsize { | |
| float: right; | |
| } | |
| .diffoscope table.diff tr.ondemand td, .diffoscope div.ondemand-details { | |
| background: #f99; | |
| text-align: center; | |
| padding: 0.5em 0; | |
| } | |
| .diffoscope table.diff tr.ondemand:hover td, .diffoscope div.ondemand-details:hover { | |
| background: #faa; | |
| cursor: pointer; | |
| } | |
| </style> | |
| </head> | |
| <body class="diffoscope"> | |
| <div class="difference"> | |
| <div class="diffheader"> | |
| <div class="diffcontrol diffcontrol-double">⊟</div> | |
| <div><span class="diffsize">9.88 KB</span></div> | |
| <div><span class="source">header-updates.patch</span> vs.</div> | |
| <div id="top"><span class="source">header-updates-rebased-theirs.patch</span> | |
| <a class="anchor" href="#top">¶</a> | |
| </div> | |
| </div> | |
| <table class="diff"> | |
| <colgroup><col class="colines"/><col class="coldiff"/> | |
| <col class="colines"/><col class="coldiff"/></colgroup> | |
| <tr style="display:none;"><td> </td><td> </td><td> </td><td> </td></tr> | |
| <tr class="diffhunk"><td colspan="2">Offset 1, 20 lines modified</td><td colspan="2">Offset 1, 7 lines modified</td></tr> | |
| <tr class="diffdeleted"><td class="diffline">1 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/Makefile<span class="dp">·</span>b/Makefile</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">2 </td><td class="diffpresent">index<span class="dp">·</span>1212d72cd..97dbf160a<span class="dp">·</span>100644</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">3 </td><td class="diffpresent">---<span class="dp">·</span>a/Makefile</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">4 </td><td class="diffpresent">+++<span class="dp">·</span>b/Makefile</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">5 </td><td class="diffpresent">@@<span class="dp">·</span>-133,8<span class="dp">·</span>+133,6<span class="dp">·</span>@@<span class="dp">·</span>safety:<span class="dp">·</span><span class="dp">·</span>##<span class="dp">·</span>Run<span class="dp">·</span>`safety<span class="dp">·</span>check`<span class="dp">·</span>to<span class="dp">·</span>check<span class="dp">·</span>python<span class="dp">·</span>dependencies<span class="dp">·</span>for<span class="dp">·</span>vulnerabilities.</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">6 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">»</span> <span class="dp">»</span> echo<span class="dp">·</span>"Checking<span class="dp">·</span>file<span class="dp">·</span>$$req_file"<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">7 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">»</span> <span class="dp">»</span> &&<span class="dp">·</span>safety<span class="dp">·</span>check<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">8 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">»</span> <span class="dp">»</span> --ignore<span class="dp">·</span>42050<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">9 </td><td class="diffpresent">-<span class="dp">»</span> <span class="dp">»</span> --ignore<span class="dp">·</span>42926<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">10 </td><td class="diffpresent">-<span class="dp">»</span> <span class="dp">»</span> --ignore<span class="dp">·</span>42923<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">11 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">»</span> <span class="dp">»</span> --full-report<span class="dp">·</span>-r<span class="dp">·</span>$$req_file<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">12 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">»</span> <span class="dp">»</span> &&<span class="dp">·</span>echo<span class="dp">·</span>-e<span class="dp">·</span>'\n'<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">13 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">»</span> <span class="dp">»</span> ||<span class="dp">·</span>exit<span class="dp">·</span>1;<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffunmodified"><td class="diffline">14 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf<span class="dp">·</span>b/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf</td><td class="diffline">1 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf<span class="dp">·</span>b/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">15 </td><td class="diffpresent">index<span class="dp">·</span>9cb61fead..ea2e5c8ca<span class="dp">·</span>100644</td><td class="diffline">2 </td><td class="diffpresent">index<span class="dp">·</span>9cb61fead..ea2e5c8ca<span class="dp">·</span>100644</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">16 </td><td class="diffpresent">---<span class="dp">·</span>a/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf</td><td class="diffline">3 </td><td class="diffpresent">---<span class="dp">·</span>a/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">17 </td><td class="diffpresent">+++<span class="dp">·</span>b/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf</td><td class="diffline">4 </td><td class="diffpresent">+++<span class="dp">·</span>b/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">18 </td><td class="diffpresent">@@<span class="dp">·</span>-24,15<span class="dp">·</span>+24,18<span class="dp">·</span>@@<span class="dp">·</span>Header<span class="dp">·</span>onsuccess<span class="dp">·</span>unset<span class="dp">·</span>X-Frame-Options</td><td class="diffline">5 </td><td class="diffpresent">@@<span class="dp">·</span>-24,15<span class="dp">·</span>+24,18<span class="dp">·</span>@@<span class="dp">·</span>Header<span class="dp">·</span>onsuccess<span class="dp">·</span>unset<span class="dp">·</span>X-Frame-Options</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">19 </td><td class="diffpresent"><span class="dp">·</span>Header<span class="dp">·</span>always<span class="dp">·</span>set<span class="dp">·</span>X-Frame-Options<span class="dp">·</span>"DENY"</td><td class="diffline">6 </td><td class="diffpresent"><span class="dp">·</span>Header<span class="dp">·</span>always<span class="dp">·</span>set<span class="dp">·</span>X-Frame-Options<span class="dp">·</span>"DENY"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">20 </td><td class="diffpresent"><span class="dp">·</span>Header<span class="dp">·</span>onsuccess<span class="dp">·</span>unset<span class="dp">·</span>Referrer-Policy</td><td class="diffline">7 </td><td class="diffpresent"><span class="dp">·</span>Header<span class="dp">·</span>onsuccess<span class="dp">·</span>unset<span class="dp">·</span>Referrer-Policy</td></tr> | |
| <tr class="diffhunk"><td colspan="2">Offset 125, 29 lines modified</td><td colspan="2">Offset 112, 30 lines modified</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">125 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>update_apache2_headers<span class="dp">·</span>/etc/apache2/sites-available/source.conf</td><td class="diffline">112 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>update_apache2_headers<span class="dp">·</span>/etc/apache2/sites-available/source.conf</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">126 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>update_apache2_headers<span class="dp">·</span>/etc/apache2/sites-available/journalist.conf</td><td class="diffline">113 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>update_apache2_headers<span class="dp">·</span>/etc/apache2/sites-available/journalist.conf</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">127 </td><td class="diffpresent">+</td><td class="diffline">114 </td><td class="diffpresent">+</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">128 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span>Restart<span class="dp">·</span>apache<span class="dp">·</span>so<span class="dp">·</span>it<span class="dp">·</span>loads<span class="dp">·</span>with<span class="dp">·</span>the<span class="dp">·</span>apparmor<span class="dp">·</span>profiles<span class="dp">·</span>in<span class="dp">·</span>enforce<span class="dp">·</span>mode.</td><td class="diffline">115 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span>Restart<span class="dp">·</span>apache<span class="dp">·</span>so<span class="dp">·</span>it<span class="dp">·</span>loads<span class="dp">·</span>with<span class="dp">·</span>the<span class="dp">·</span>apparmor<span class="dp">·</span>profiles<span class="dp">·</span>in<span class="dp">·</span>enforce<span class="dp">·</span>mode.</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">129 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>service<span class="dp">·</span>apache2<span class="dp">·</span>restart</td><td class="diffline">116 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>service<span class="dp">·</span>apache2<span class="dp">·</span>restart</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">130 </td><td class="diffpresent"><span class="dp">·</span></td><td class="diffline">117 </td><td class="diffpresent"><span class="dp">·</span></td></tr> | |
| <tr class="diffunmodified"><td class="diffline">131 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/molecule/testinfra/vars/app-qubes-staging.yml<span class="dp">·</span>b/molecule/testinfra/vars/app-qubes-staging.yml</td><td class="diffline">118 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/molecule/testinfra/vars/app-qubes-staging.yml<span class="dp">·</span>b/molecule/testinfra/vars/app-qubes-staging.yml</td></tr> | |
| <tr class="diffchanged"><td class="diffline">132 </td><td class="diffpresent">index<span class="dp">·</span>434e50670..<del>4e897a981</del><span class="dp">·</span>100644</td><td class="diffline">119 </td><td class="diffpresent">index<span class="dp">·</span>434e50670..<ins>913fa0e4d</ins><span class="dp">·</span>100644</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">133 </td><td class="diffpresent">---<span class="dp">·</span>a/molecule/testinfra/vars/app-qubes-staging.yml</td><td class="diffline">120 </td><td class="diffpresent">---<span class="dp">·</span>a/molecule/testinfra/vars/app-qubes-staging.yml</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">134 </td><td class="diffpresent">+++<span class="dp">·</span>b/molecule/testinfra/vars/app-qubes-staging.yml</td><td class="diffline">121 </td><td class="diffpresent">+++<span class="dp">·</span>b/molecule/testinfra/vars/app-qubes-staging.yml</td></tr> | |
| <tr class="diffchanged"><td class="diffline">135 </td><td class="diffpresent">@@<span class="dp">·</span>-1,10<span class="dp">·</span>+1,1<del>1</del><span class="dp">·</span>@@</td><td class="diffline">122 </td><td class="diffpresent">@@<span class="dp">·</span>-1,10<span class="dp">·</span>+1,1<ins>2</ins><span class="dp">·</span>@@</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">136 </td><td class="diffpresent"><span class="dp">·</span>---</td><td class="diffline">123 </td><td class="diffpresent"><span class="dp">·</span>---</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">137 </td><td class="diffpresent"><span class="dp">·</span>#<span class="dp">·</span>Testinfra<span class="dp">·</span>vars<span class="dp">·</span>file<span class="dp">·</span>for<span class="dp">·</span>app-staigng.</td><td class="diffline">124 </td><td class="diffpresent"><span class="dp">·</span>#<span class="dp">·</span>Testinfra<span class="dp">·</span>vars<span class="dp">·</span>file<span class="dp">·</span>for<span class="dp">·</span>app-staigng.</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">138 </td><td class="diffpresent"><span class="dp">·</span>wanted_apache_headers:</td><td class="diffline">125 </td><td class="diffpresent"><span class="dp">·</span>wanted_apache_headers:</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">139 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span>X-XSS-Protection:<span class="dp">·</span>"1;<span class="dp">·</span>mode=block"</td><td class="diffline">126 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span>X-XSS-Protection:<span class="dp">·</span>"1;<span class="dp">·</span>mode=block"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">140 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>X-Content-Type-Options:<span class="dp">·</span>nosniff</td><td class="diffline">127 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>X-Content-Type-Options:<span class="dp">·</span>nosniff</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">141 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span>X-Download-Options:<span class="dp">·</span>noopen</td><td class="diffline">128 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span>X-Download-Options:<span class="dp">·</span>noopen</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">142 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span>Content-Security-Policy:<span class="dp">·</span>"default-src<span class="dp">·</span>'none';<span class="dp">·</span>script-src<span class="dp">·</span>'self';<span class="dp">·</span>style-src<span class="dp">·</span>'self';<span class="dp">·</span>img-src<span class="dp">·</span>'self';<span class="dp">·</span>font-src<span class="dp">·</span>'self';"</td><td class="diffline">129 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span>Content-Security-Policy:<span class="dp">·</span>"default-src<span class="dp">·</span>'none';<span class="dp">·</span>script-src<span class="dp">·</span>'self';<span class="dp">·</span>style-src<span class="dp">·</span>'self';<span class="dp">·</span>img-src<span class="dp">·</span>'self';<span class="dp">·</span>font-src<span class="dp">·</span>'self';"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">143 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Content-Security-Policy:<span class="dp">·</span>"default-src<span class="dp">·</span>'none';<span class="dp">·</span>script-src<span class="dp">·</span>'self';<span class="dp">·</span>style-src<span class="dp">·</span>'self';<span class="dp">·</span>img-src<span class="dp">·</span>'self';<span class="dp">·</span>font-src<span class="dp">·</span>'self';<span class="dp">·</span>frame-ancestors<span class="dp">·</span>'none';"</td><td class="diffline">130 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Content-Security-Policy:<span class="dp">·</span>"default-src<span class="dp">·</span>'none';<span class="dp">·</span>script-src<span class="dp">·</span>'self';<span class="dp">·</span>style-src<span class="dp">·</span>'self';<span class="dp">·</span>img-src<span class="dp">·</span>'self';<span class="dp">·</span>font-src<span class="dp">·</span>'self';<span class="dp">·</span>frame-ancestors<span class="dp">·</span>'none';"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">144 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Opener-Policy:<span class="dp">·</span>"same-origin"</td><td class="diffline">131 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Opener-Policy:<span class="dp">·</span>"same-origin"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">145 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Embedder-Policy:<span class="dp">·</span>"same-origin"</td><td class="diffline">132 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Embedder-Policy:<span class="dp">·</span>"same-origin"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">146 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Resource-Policy:<span class="dp">·</span>"same-site"</td><td class="diffline">133 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Resource-Policy:<span class="dp">·</span>"same-site"</td></tr> | |
| <tr class="diffadded"><td colspan="2"> </td><td class="diffline">134 </td><td class="diffpresent">+</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">147 </td><td class="diffpresent"><span class="dp">·</span></td><td class="diffline">135 </td><td class="diffpresent"><span class="dp">·</span></td></tr> | |
| <tr class="diffunmodified"><td class="diffline">148 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv:<span class="dp">·</span>/opt/venvs/securedrop-app-code</td><td class="diffline">136 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv:<span class="dp">·</span>/opt/venvs/securedrop-app-code</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">149 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv_bin:<span class="dp">·</span>"{{<span class="dp">·</span>securedrop_venv<span class="dp">·</span>}}/bin"</td><td class="diffline">137 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv_bin:<span class="dp">·</span>"{{<span class="dp">·</span>securedrop_venv<span class="dp">·</span>}}/bin"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">150 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/molecule/testinfra/vars/app-staging.yml<span class="dp">·</span>b/molecule/testinfra/vars/app-staging.yml</td><td class="diffline">138 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/molecule/testinfra/vars/app-staging.yml<span class="dp">·</span>b/molecule/testinfra/vars/app-staging.yml</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">151 </td><td class="diffpresent">index<span class="dp">·</span>f4f6ffff6..7432a695a<span class="dp">·</span>100644</td><td class="diffline">139 </td><td class="diffpresent">index<span class="dp">·</span>f4f6ffff6..7432a695a<span class="dp">·</span>100644</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">152 </td><td class="diffpresent">---<span class="dp">·</span>a/molecule/testinfra/vars/app-staging.yml</td><td class="diffline">140 </td><td class="diffpresent">---<span class="dp">·</span>a/molecule/testinfra/vars/app-staging.yml</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">153 </td><td class="diffpresent">+++<span class="dp">·</span>b/molecule/testinfra/vars/app-staging.yml</td><td class="diffline">141 </td><td class="diffpresent">+++<span class="dp">·</span>b/molecule/testinfra/vars/app-staging.yml</td></tr> | |
| <tr class="diffhunk"><td colspan="2">Offset 238, 163 lines modified</td><td colspan="2">Offset 226, 7 lines modified</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">238 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Content-Security-Policy:<span class="dp">·</span>"default-src<span class="dp">·</span>'none';<span class="dp">·</span>script-src<span class="dp">·</span>'self';<span class="dp">·</span>style-src<span class="dp">·</span>'self';<span class="dp">·</span>img-src<span class="dp">·</span>'self';<span class="dp">·</span>font-src<span class="dp">·</span>'self';<span class="dp">·</span>frame-ancestors<span class="dp">·</span>'none';"</td><td class="diffline">226 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Content-Security-Policy:<span class="dp">·</span>"default-src<span class="dp">·</span>'none';<span class="dp">·</span>script-src<span class="dp">·</span>'self';<span class="dp">·</span>style-src<span class="dp">·</span>'self';<span class="dp">·</span>img-src<span class="dp">·</span>'self';<span class="dp">·</span>font-src<span class="dp">·</span>'self';<span class="dp">·</span>frame-ancestors<span class="dp">·</span>'none';"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">239 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Opener-Policy:<span class="dp">·</span>"same-origin"</td><td class="diffline">227 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Opener-Policy:<span class="dp">·</span>"same-origin"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">240 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Embedder-Policy:<span class="dp">·</span>"same-origin"</td><td class="diffline">228 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Embedder-Policy:<span class="dp">·</span>"same-origin"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">241 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Resource-Policy:<span class="dp">·</span>"same-site"</td><td class="diffline">229 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span>Cross-Origin-Resource-Policy:<span class="dp">·</span>"same-site"</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">242 </td><td class="diffpresent"><span class="dp">·</span></td><td class="diffline">230 </td><td class="diffpresent"><span class="dp">·</span></td></tr> | |
| <tr class="diffunmodified"><td class="diffline">243 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv:<span class="dp">·</span>/opt/venvs/securedrop-app-code</td><td class="diffline">231 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv:<span class="dp">·</span>/opt/venvs/securedrop-app-code</td></tr> | |
| <tr class="diffunmodified"><td class="diffline">244 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv_bin:<span class="dp">·</span>/opt/venvs/securedrop-app-code/bin</td><td class="diffline">232 </td><td class="diffpresent"><span class="dp">·</span>securedrop_venv_bin:<span class="dp">·</span>/opt/venvs/securedrop-app-code/bin</td></tr> | |
| <tr class="diffdeleted"><td class="diffline">245 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/securedrop/requirements/python3/securedrop-app-code-requirements.in<span class="dp">·</span>b/securedrop/requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">246 </td><td class="diffpresent">index<span class="dp">·</span>493318e33..46ca9c923<span class="dp">·</span>100644</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">247 </td><td class="diffpresent">---<span class="dp">·</span>a/securedrop/requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">248 </td><td class="diffpresent">+++<span class="dp">·</span>b/securedrop/requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">249 </td><td class="diffpresent">@@<span class="dp">·</span>-27,4<span class="dp">·</span>+27,3<span class="dp">·</span>@@<span class="dp">·</span>sh</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">250 </td><td class="diffpresent"><span class="dp">·</span>SQLAlchemy>=1.3.0</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">251 </td><td class="diffpresent"><span class="dp">·</span>typing;python_version<"3.8"</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">252 </td><td class="diffpresent"><span class="dp">·</span>Werkzeug>=0.15.3</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">253 </td><td class="diffpresent">-wtforms>=3.0.0</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">254 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/securedrop/requirements/python3/securedrop-app-code-requirements.txt<span class="dp">·</span>b/securedrop/requirements/python3/securedrop-app-code-requirements.txt</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">255 </td><td class="diffpresent">index<span class="dp">·</span>ac0b2b06d..152430ed8<span class="dp">·</span>100644</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">256 </td><td class="diffpresent">---<span class="dp">·</span>a/securedrop/requirements/python3/securedrop-app-code-requirements.txt</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">257 </td><td class="diffpresent">+++<span class="dp">·</span>b/securedrop/requirements/python3/securedrop-app-code-requirements.txt</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">258 </td><td class="diffpresent">@@<span class="dp">·</span>-183,7<span class="dp">·</span>+183,6<span class="dp">·</span>@@<span class="dp">·</span>markupsafe==1.1.1<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">259 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>-r<span class="dp">·</span>requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">260 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>jinja2</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">261 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>mako</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">262 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>wtforms</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">263 </td><td class="diffpresent"><span class="dp">·</span>mod-wsgi==4.6.7<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">264 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>--hash=sha256:b788abaf0b903a64a7bb8dae609f2e4790c87e6f3d716aa6bc97936410fcbfcc</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">265 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span>via<span class="dp">·</span>-r<span class="dp">·</span>requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">266 </td><td class="diffpresent">@@<span class="dp">·</span>-267,12<span class="dp">·</span>+266,9<span class="dp">·</span>@@<span class="dp">·</span>werkzeug==0.16.0<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">267 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span>via</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">268 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>-r<span class="dp">·</span>requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">269 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>flask</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">270 </td><td class="diffpresent">-wtforms==3.0.0<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">271 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>--hash=sha256:232dbb0094847dca2f45c72136b5ca1d5dca2a3e24ccd2229823b8b74b3c6698<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">272 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>--hash=sha256:4abfbaa1d529a1d0ac927d44af8dbb9833afd910e56448a103f1893b0b176886</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">273 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span>via</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">274 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>-r<span class="dp">·</span>requirements/python3/securedrop-app-code-requirements.in</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">275 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>flask-wtf</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">276 </td><td class="diffpresent">+wtforms==2.1<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">277 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>--hash=sha256:ffdf10bd1fa565b8233380cb77a304cd36fd55c73023e91d4b803c96bc11d46f</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">278 </td><td class="diffpresent">+<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>#<span class="dp">·</span>via<span class="dp">·</span>flask-wtf</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">279 </td><td class="diffpresent"><span class="dp">·</span></td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">280 </td><td class="diffpresent"><span class="dp">·</span>#<span class="dp">·</span>The<span class="dp">·</span>following<span class="dp">·</span>packages<span class="dp">·</span>are<span class="dp">·</span>considered<span class="dp">·</span>to<span class="dp">·</span>be<span class="dp">·</span>unsafe<span class="dp">·</span>in<span class="dp">·</span>a<span class="dp">·</span>requirements<span class="dp">·</span>file:</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">281 </td><td class="diffpresent"><span class="dp">·</span>setuptools==56.0.0<span class="dp">·</span>\</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">282 </td><td class="diffpresent">diff<span class="dp">·</span>--git<span class="dp">·</span>a/securedrop/tests/test_journalist.py<span class="dp">·</span>b/securedrop/tests/test_journalist.py</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">283 </td><td class="diffpresent">index<span class="dp">·</span>1f3b3bbbd..64bc799d6<span class="dp">·</span>100644</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">284 </td><td class="diffpresent">---<span class="dp">·</span>a/securedrop/tests/test_journalist.py</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">285 </td><td class="diffpresent">+++<span class="dp">·</span>b/securedrop/tests/test_journalist.py</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">286 </td><td class="diffpresent">@@<span class="dp">·</span>-775,7<span class="dp">·</span>+775,6<span class="dp">·</span>@@<span class="dp">·</span>def<span class="dp">·</span>test_admin_add_user_when_username_already_taken(config,<span class="dp">·</span>journalist_app,<span class="dp">·</span>test</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">287 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>first_name='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">288 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>last_name='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">289 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>password=VALID_PASSWORD,</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">290 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>otp_secret='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">291 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>is_admin=None</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">292 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>),</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">293 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>)</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">294 </td><td class="diffpresent">@@<span class="dp">·</span>-891,7<span class="dp">·</span>+890,6<span class="dp">·</span>@@<span class="dp">·</span>def<span class="dp">·</span>test_admin_add_user_password_too_long_warning(config,<span class="dp">·</span>journalist_app,<span class="dp">·</span>test_a</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">295 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>first_name='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">296 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>last_name='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">297 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>password=overly_long_password,</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">298 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>otp_secret='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">299 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>is_admin=None</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">300 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>),</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">301 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>)</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">302 </td><td class="diffpresent">@@<span class="dp">·</span>-919,7<span class="dp">·</span>+917,6<span class="dp">·</span>@@<span class="dp">·</span>def<span class="dp">·</span>test_admin_add_user_first_name_too_long_warning(config,<span class="dp">·</span>journalist_app,<span class="dp">·</span>test</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">303 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>first_name=overly_long_name,</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">304 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>last_name='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">305 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>password=VALID_PASSWORD,</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">306 </td><td class="diffpresent">-<span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>otp_secret='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">307 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>is_admin=None</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">308 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>),</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">309 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>)</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">310 </td><td class="diffpresent">@@<span class="dp">·</span>-950,7<span class="dp">·</span>+947,6<span class="dp">·</span>@@<span class="dp">·</span>def<span class="dp">·</span>test_admin_add_user_last_name_too_long_warning(config,<span class="dp">·</span>journalist_app,<span class="dp">·</span>test_</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">311 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>first_name='',</td><td colspan="2"> </td></tr> | |
| <tr class="diffdeleted"><td class="diffline">312 </td><td class="diffpresent"><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span><span class="dp">·</span>last_name=overly_long_name,</td><td colspan="2"> </td></tr> | |
| <tr class="error"><td colspan="4"> | |
| Max diff block lines reached; -1/10061 bytes (-0.01%) of diff not shown. | |
| </td></tr></table></div> | |
| <div class="footer"> | |
| Generated by | |
| <a href="https://diffoscope.org" rel="noopener noreferrer" target="_blank"> | |
| diffoscope</a> 194 | |
| </div> | |
| </body> | |
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- header-updates.patch | |
| +++ header-updates-rebased-theirs.patch | |
| @@ -1,20 +1,7 @@ | |
| -diff --git a/Makefile b/Makefile | |
| -index 1212d72cd..97dbf160a 100644 | |
| ---- a/Makefile | |
| -+++ b/Makefile | |
| -@@ -133,8 +133,6 @@ safety: ## Run `safety check` to check python dependencies for vulnerabilities. | |
| - echo "Checking file $$req_file" \ | |
| - && safety check \ | |
| - --ignore 42050 \ | |
| -- --ignore 42926 \ | |
| -- --ignore 42923 \ | |
| - --full-report -r $$req_file \ | |
| - && echo -e '\n' \ | |
| - || exit 1; \ | |
| diff --git a/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf b/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf | |
| index 9cb61fead..ea2e5c8ca 100644 | |
| --- a/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf | |
| +++ b/install_files/ansible-base/roles/app/templates/sites-available/focal/journalist.conf | |
| @@ -24,15 +24,18 @@ Header onsuccess unset X-Frame-Options | |
| Header always set X-Frame-Options "DENY" | |
| Header onsuccess unset Referrer-Policy | |
| @@ -125,29 +112,30 @@ | |
| + update_apache2_headers /etc/apache2/sites-available/source.conf | |
| + update_apache2_headers /etc/apache2/sites-available/journalist.conf | |
| + | |
| # Restart apache so it loads with the apparmor profiles in enforce mode. | |
| service apache2 restart | |
| diff --git a/molecule/testinfra/vars/app-qubes-staging.yml b/molecule/testinfra/vars/app-qubes-staging.yml | |
| -index 434e50670..4e897a981 100644 | |
| +index 434e50670..913fa0e4d 100644 | |
| --- a/molecule/testinfra/vars/app-qubes-staging.yml | |
| +++ b/molecule/testinfra/vars/app-qubes-staging.yml | |
| -@@ -1,10 +1,11 @@ | |
| +@@ -1,10 +1,12 @@ | |
| --- | |
| # Testinfra vars file for app-staigng. | |
| wanted_apache_headers: | |
| - X-XSS-Protection: "1; mode=block" | |
| X-Content-Type-Options: nosniff | |
| - X-Download-Options: noopen | |
| - Content-Security-Policy: "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'; font-src 'self';" | |
| + Content-Security-Policy: "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; frame-ancestors 'none';" | |
| + Cross-Origin-Opener-Policy: "same-origin" | |
| + Cross-Origin-Embedder-Policy: "same-origin" | |
| + Cross-Origin-Resource-Policy: "same-site" | |
| ++ | |
| securedrop_venv: /opt/venvs/securedrop-app-code | |
| securedrop_venv_bin: "{{ securedrop_venv }}/bin" | |
| diff --git a/molecule/testinfra/vars/app-staging.yml b/molecule/testinfra/vars/app-staging.yml | |
| index f4f6ffff6..7432a695a 100644 | |
| --- a/molecule/testinfra/vars/app-staging.yml | |
| +++ b/molecule/testinfra/vars/app-staging.yml | |
| @@ -238,163 +226,7 @@ | |
| + Content-Security-Policy: "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; frame-ancestors 'none';" | |
| + Cross-Origin-Opener-Policy: "same-origin" | |
| + Cross-Origin-Embedder-Policy: "same-origin" | |
| + Cross-Origin-Resource-Policy: "same-site" | |
| securedrop_venv: /opt/venvs/securedrop-app-code | |
| securedrop_venv_bin: /opt/venvs/securedrop-app-code/bin | |
| -diff --git a/securedrop/requirements/python3/securedrop-app-code-requirements.in b/securedrop/requirements/python3/securedrop-app-code-requirements.in | |
| -index 493318e33..46ca9c923 100644 | |
| ---- a/securedrop/requirements/python3/securedrop-app-code-requirements.in | |
| -+++ b/securedrop/requirements/python3/securedrop-app-code-requirements.in | |
| -@@ -27,4 +27,3 @@ sh | |
| - SQLAlchemy>=1.3.0 | |
| - typing;python_version<"3.8" | |
| - Werkzeug>=0.15.3 | |
| --wtforms>=3.0.0 | |
| -diff --git a/securedrop/requirements/python3/securedrop-app-code-requirements.txt b/securedrop/requirements/python3/securedrop-app-code-requirements.txt | |
| -index ac0b2b06d..152430ed8 100644 | |
| ---- a/securedrop/requirements/python3/securedrop-app-code-requirements.txt | |
| -+++ b/securedrop/requirements/python3/securedrop-app-code-requirements.txt | |
| -@@ -183,7 +183,6 @@ markupsafe==1.1.1 \ | |
| - # -r requirements/python3/securedrop-app-code-requirements.in | |
| - # jinja2 | |
| - # mako | |
| -- # wtforms | |
| - mod-wsgi==4.6.7 \ | |
| - --hash=sha256:b788abaf0b903a64a7bb8dae609f2e4790c87e6f3d716aa6bc97936410fcbfcc | |
| - # via -r requirements/python3/securedrop-app-code-requirements.in | |
| -@@ -267,12 +266,9 @@ werkzeug==0.16.0 \ | |
| - # via | |
| - # -r requirements/python3/securedrop-app-code-requirements.in | |
| - # flask | |
| --wtforms==3.0.0 \ | |
| -- --hash=sha256:232dbb0094847dca2f45c72136b5ca1d5dca2a3e24ccd2229823b8b74b3c6698 \ | |
| -- --hash=sha256:4abfbaa1d529a1d0ac927d44af8dbb9833afd910e56448a103f1893b0b176886 | |
| -- # via | |
| -- # -r requirements/python3/securedrop-app-code-requirements.in | |
| -- # flask-wtf | |
| -+wtforms==2.1 \ | |
| -+ --hash=sha256:ffdf10bd1fa565b8233380cb77a304cd36fd55c73023e91d4b803c96bc11d46f | |
| -+ # via flask-wtf | |
| - | |
| - # The following packages are considered to be unsafe in a requirements file: | |
| - setuptools==56.0.0 \ | |
| -diff --git a/securedrop/tests/test_journalist.py b/securedrop/tests/test_journalist.py | |
| -index 1f3b3bbbd..64bc799d6 100644 | |
| ---- a/securedrop/tests/test_journalist.py | |
| -+++ b/securedrop/tests/test_journalist.py | |
| -@@ -775,7 +775,6 @@ def test_admin_add_user_when_username_already_taken(config, journalist_app, test | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) | |
| -@@ -891,7 +890,6 @@ def test_admin_add_user_password_too_long_warning(config, journalist_app, test_a | |
| - first_name='', | |
| - last_name='', | |
| - password=overly_long_password, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) | |
| -@@ -919,7 +917,6 @@ def test_admin_add_user_first_name_too_long_warning(config, journalist_app, test | |
| - first_name=overly_long_name, | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) | |
| -@@ -950,7 +947,6 @@ def test_admin_add_user_last_name_too_long_warning(config, journalist_app, test_ | |
| - first_name='', | |
| - last_name=overly_long_name, | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) | |
| -@@ -1331,7 +1327,6 @@ def test_admin_add_user(journalist_app, test_admin): | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None)) | |
| - | |
| - new_user = Journalist.query.filter_by(username=username).one() | |
| -@@ -1354,7 +1349,6 @@ def test_admin_add_user_with_invalid_username(config, journalist_app, test_admin | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) | |
| -@@ -1439,13 +1433,7 @@ def test_admin_add_user_without_username(config, journalist_app, test_admin, loc | |
| - | |
| - resp = app.post( | |
| - url_for('admin.add_user', l=locale), | |
| -- data=dict( | |
| -- username='', | |
| -- first_name='', | |
| -- last_name='', | |
| -- password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| -- is_admin=None), | |
| -+ data=dict(username='', password=VALID_PASSWORD, is_admin=None), | |
| - ) | |
| - | |
| - assert page_language(resp.data) == language_tag(locale) | |
| -@@ -1467,11 +1455,8 @@ def test_admin_add_user_too_short_username(config, journalist_app, test_admin, l | |
| - url_for('admin.add_user', l=locale), | |
| - data=dict( | |
| - username=username, | |
| -- first_name='', | |
| -- last_name='', | |
| - password='pentagonpapers', | |
| - password_again='pentagonpapers', | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) | |
| -@@ -1599,7 +1584,6 @@ def test_admin_sets_user_to_admin(journalist_app, test_admin): | |
| - data=dict(username=new_user, | |
| - first_name='', | |
| - last_name='', | |
| -- otp_secret='', | |
| - password=VALID_PASSWORD, | |
| - is_admin=None)) | |
| - assert resp.status_code in (200, 302) | |
| -@@ -1628,7 +1612,6 @@ def test_admin_renames_user(journalist_app, test_admin): | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None)) | |
| - assert resp.status_code in (200, 302) | |
| - journo = Journalist.query.filter(Journalist.username == new_user).one() | |
| -@@ -1657,7 +1640,6 @@ def test_admin_adds_first_name_last_name_to_user(journalist_app, test_admin): | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None)) | |
| - assert resp.status_code in (200, 302) | |
| - journo = Journalist.query.filter(Journalist.username == new_user).one() | |
| -@@ -1690,7 +1672,6 @@ def test_admin_adds_invalid_first_last_name_to_user(config, journalist_app, test | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ) | |
| - ) | |
| -@@ -1742,7 +1723,6 @@ def test_admin_add_user_integrity_error(config, journalist_app, test_admin, mock | |
| - first_name='', | |
| - last_name='', | |
| - password=VALID_PASSWORD, | |
| -- otp_secret='', | |
| - is_admin=None | |
| - ), | |
| - ) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment