Allow overwrite when updating forum style

[chef.git] / cookbooks / tile / templates / default / export.erb

diff --git a/cookbooks/tile/templates/default/export.erb b/cookbooks/tile/templates/default/export.erb
index 5e4b97414b9c843390047bc85e06eccf4d56074e..0cd115271c5bcf313560dd6fff074b2e7f95be42 100644 (file)
--- a/cookbooks/tile/templates/default/export.erb
+++ b/cookbooks/tile/templates/default/export.erb
@@ -3,13 +3,15 @@
 
 import cairo
 import cgi
 
 import cairo
 import cgi

+import Cookie

 import mapnik
 import os
 import mapnik
 import os

+import pyotp
+import resource

 import shutil
 import shutil

+import signal

 import sys
 import tempfile
 import sys
 import tempfile

-import resource
-import signal

 
 # Limit maximum CPU time
 # The Postscript output format can sometimes take hours
 
 # Limit maximum CPU time
 # The Postscript output format can sometimes take hours


@@ -51,9 +53,15 @@ def output_error(message, status = "400 Bad Request"):
   print "</body>"
   print "</html>"
 
   print "</body>"
   print "</html>"
 

+# Create TOTP token validator
+totp = pyotp.TOTP('<%= @totp_key %>', interval = 3600)
+

 # Parse CGI parameters
 form = cgi.FieldStorage()
 
 # Parse CGI parameters
 form = cgi.FieldStorage()
 

+# Import cookies
+cookies = Cookie.SimpleCookie(os.environ.get('HTTP_COOKIE'))
+

 # Make sure we have a user agent
 if not os.environ.has_key('HTTP_USER_AGENT'):
   os.environ['HTTP_USER_AGENT'] = 'NONE'
 # Make sure we have a user agent
 if not os.environ.has_key('HTTP_USER_AGENT'):
   os.environ['HTTP_USER_AGENT'] = 'NONE'


@@ -62,17 +70,23 @@ if not os.environ.has_key('HTTP_USER_AGENT'):
 if not os.environ.has_key('HTTP_REFERER'):
   os.environ['HTTP_REFERER'] = 'NONE'
 
 if not os.environ.has_key('HTTP_REFERER'):
   os.environ['HTTP_REFERER'] = 'NONE'
 

+# Look for TOTP token
+if cookies.has_key('_osm_totp_token'):
+  token = cookies['_osm_totp_token'].value
+else:
+  token = None
+

 # Get the load average
 cputimes = [float(n) for n in open("/proc/stat").readline().rstrip().split()[1:-1]]
 idletime = cputimes[3] / sum(cputimes)
 
 # Process the request
 # Get the load average
 cputimes = [float(n) for n in open("/proc/stat").readline().rstrip().split()[1:-1]]
 idletime = cputimes[3] / sum(cputimes)
 
 # Process the request

-if idletime < 0.2:
+if not totp.verify(token, valid_window = 1):
+  # Abort if the request didn't have a valid TOTP token
+  output_error("Missing or invalid token")
+elif idletime < 0.2:

   # Abort if the CPU idle time on the machine is too low
   output_error("The server is too busy at the moment. Please wait a few minutes before trying again.", "503 Service Unavailable")
   # Abort if the CPU idle time on the machine is too low
   output_error("The server is too busy at the moment. Please wait a few minutes before trying again.", "503 Service Unavailable")

-elif form.getvalue("scale") == "3600":
-  # Block scraper
-  output_error("The server is too busy at the moment. Please wait a few minutes before trying again.", "503 Service Unavailable")

 <% @blocks["user_agents"].each do |user_agent| -%>
 elif os.environ['HTTP_USER_AGENT'] == '<%= user_agent %>':
   # Block scraper
 <% @blocks["user_agents"].each do |user_agent| -%>
 elif os.environ['HTTP_USER_AGENT'] == '<%= user_agent %>':
   # Block scraper


@@ -148,6 +162,7 @@ else:
         elif form.getvalue("format") == "svg":
           file = tempfile.NamedTemporaryFile(prefix = "export")
           surface = cairo.SVGSurface(file.name, map.width, map.height)
         elif form.getvalue("format") == "svg":
           file = tempfile.NamedTemporaryFile(prefix = "export")
           surface = cairo.SVGSurface(file.name, map.width, map.height)

+          surface.restrict_to_version(cairo.SVG_VERSION_1_2)

           mapnik.render(map, surface)
           surface.finish()
           output_headers("image/svg+xml", "map.svg", file_size(file))
           mapnik.render(map, surface)
           surface.finish()
           output_headers("image/svg+xml", "map.svg", file_size(file))