Merge pull request #542 from mozilla/MP1556-deprecation-headers

fix(api): before sunset

httpobs/website/api.py

@@ -10,12 +10,7 @@
 from httpobs.conf import API_ALLOW_VERBOSE_STATS_FROM_PUBLIC, API_COOLDOWN, DEVELOPMENT_MODE
 from httpobs.scanner import scan
 from httpobs.scanner.grader import GRADES, get_score_description
-from httpobs.website import (
-    add_response_headers,
-    add_sunset_headers,
-    check_for_deprecation_override_header,
-    sanitized_api_response,
-)
+from httpobs.website import add_response_headers, add_sunset_headers, sanitized_api_response
 from httpobs.website.utils import valid_hostname
 
 api = Blueprint('api', __name__)
@@ -26,8 +21,8 @@
 
 @api.route('/api/v1/analyze', methods=['GET', 'OPTIONS', 'POST'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 @sanitized_api_response
 def api_post_scan_hostname():
     # TODO: Allow people to accidentally use https://mozilla.org and convert to mozilla.org
@@ -127,8 +122,8 @@ def api_post_scan_hostname():
 # TODO: Deprecate this and replace with __stats__ once website is updated
 @api.route('/api/v1/getGradeDistribution', methods=['GET', 'OPTIONS'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 def api_get_grade_totals():
     totals = database.select_star_from('grade_distribution')
 
@@ -140,8 +135,8 @@ def api_get_grade_totals():
 
 @api.route('/api/v1/getHostHistory', methods=['GET', 'OPTIONS'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 def api_get_host_history():
     # Get the hostname
     hostname = request.args.get('host', '').lower()
@@ -175,8 +170,8 @@ def api_get_host_history():
 
 @api.route('/api/v1/getRecentScans', methods=['GET', 'OPTIONS'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 def api_get_recent_scans():
     try:
         # Get the min and max scores, if they're there
@@ -198,8 +193,8 @@ def api_get_recent_scans():
 # TODO: Deprecate
 @api.route('/api/v1/getScannerStates', methods=['GET', 'OPTIONS'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 def api_get_scanner_states():
     stats = database.select_scan_scanner_statistics(verbose=False)
 
@@ -208,8 +203,8 @@ def api_get_scanner_states():
 
 @api.route('/api/v1/__stats__', methods=['GET', 'OPTIONS'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 def api_get_scanner_stats():
     pretty = True if request.args.get('pretty', '').lower() == 'true' else False
     verbose = False
@@ -277,8 +272,8 @@ def api_get_scanner_stats():
 
 @api.route('/api/v1/getScanResults', methods=['GET', 'OPTIONS'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers(cors=True)
+# @check_for_deprecation_override_header
 @sanitized_api_response
 def api_get_scan_results():
     scan_id = request.args.get('scan')
@@ -308,8 +303,8 @@ def api_get_scan_results():
 
 @api.route('/contribute.json', methods=['GET'])
 @add_sunset_headers()
-@check_for_deprecation_override_header
 @add_response_headers()
+# @check_for_deprecation_override_header
 def contribute_json():
     __dirname = os.path.abspath(os.path.dirname(__file__))
     __filename = os.path.join(__dirname, '..', 'docs', 'contribute.json')