← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to services/serveservice

  • Committer: William Grant
  • Date: 2009-03-10 03:21:12 UTC
  • Revision ID: grantw@unimelb.edu.au-20090310032112-i5eb1yjhc9imfsnf
serveservice now only respects the download (black|white)lists when serving,
not downloading.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/serveservice
113
113
           determine_file_type(filename) in ivle.conf.app.server.interpreters:
114
114
            throw_error('is-executable', {'path': filename})
115
115
 
116
 
        if (ivle.conf.app.server.blacklist_served_filetypes and \
 
116
        if not download and (
 
117
            (ivle.conf.app.server.blacklist_served_filetypes and \
117
118
                determine_file_type(filename) in \
118
119
                ivle.conf.app.server.served_filetypes_blacklist) or \
119
120
            (ivle.conf.app.server.served_filetypes_whitelist and \
120
121
                determine_file_type(filename) not in \
121
 
                ivle.conf.app.server.served_filetypes_whitelist):
 
122
                ivle.conf.app.server.served_filetypes_whitelist)):
122
123
            throw_error('forbidden')
123
124
 
124
125
if zipmode: