Ignore:
Timestamp:
29/08/07 08:44:37 (12 years ago)
Author:
domlowe
Message:

fixing wcs store so that it respects security

Location:
TI05-delivery/ows_framework/trunk/ows_server
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server.egg-info/PKG-INFO

    r2801 r2850  
    11Metadata-Version: 1.0 
    22Name: ows-server 
    3 Version: 0.0.0dev-r2800 
     3Version: 0.0.0dev-r2848 
    44Summary: UNKNOWN 
    55Home-page: UNKNOWN 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server.egg-info/SOURCES.txt

    r2801 r2850  
    1414ows_server.egg-info/dependency_links.txt 
    1515ows_server.egg-info/entry_points.txt 
     16ows_server.egg-info/paster_plugins.txt 
    1617ows_server.egg-info/requires.txt 
    1718ows_server.egg-info/top_level.txt 
     
    2526ows_server/controllers/csml_api.py 
    2627ows_server/controllers/csml_wcs.py 
     28ows_server/controllers/csml_wcs_poll.py 
    2729ows_server/controllers/csml_wms.py 
    2830ows_server/controllers/discovery.py 
     
    3234ows_server/controllers/logout.py 
    3335ows_server/controllers/retrieve.py 
     36ows_server/controllers/selection.py 
    3437ows_server/controllers/status.py 
    3538ows_server/controllers/tabs.py 
     
    5558ows_server/lib/helpers.py 
    5659ows_server/lib/mailer.py 
    57 ows_server/lib/ndgCache.py 
    5860ows_server/lib/ndgInterface.py 
    5961ows_server/lib/render.py 
     
    6971ows_server/models/DocumentRetrieve.py 
    7072ows_server/models/ETxmlView.py 
    71 ows_server/models/NSawareET.py 
    7273ows_server/models/People.py 
    7374ows_server/models/People2.py 
    7475ows_server/models/ServiceBinding.py 
    7576ows_server/models/Utilities.py 
     77ows_server/models/VocabServer1.1.wsdl 
    7678ows_server/models/__init__.py 
    7779ows_server/models/eXistInterface.py 
     
    8183ows_server/models/ndgRetrieve.py 
    8284ows_server/models/ndgSearch.py 
    83 ows_server/models/ndgSearch.py~ 
    8485ows_server/models/ndgSecurity.py 
     86ows_server/models/ndgVocab.py 
    8587ows_server/models/ndg_xqueries.py 
    8688ows_server/models/ndg_xqueries.py~ 
    8789ows_server/models/stubB.py 
    88 ows_server/models/tmp.py 
    89 ows_server/models/tmp2.py 
     90ows_server/models/vocabDefs_services.py 
     91ows_server/models/vocabDefs_services_types.py 
    9092ows_server/models/wcs_CoverageDescription.py 
     93ows_server/models/wsdlUse 
    9194ows_server/models/xmlHandler.py 
    9295ows_server/models/xmlHandler2.py 
     
    196199ows_server/templates/csml_describe.kid 
    197200ows_server/templates/csml_describe_feature.kid 
     201ows_server/templates/csml_granule_summary.kid 
    198202ows_server/templates/dif.kid 
    199203ows_server/templates/error.kid 
     
    207211ows_server/templates/renderService.py 
    208212ows_server/templates/results.kid 
     213ows_server/templates/selection.kid 
    209214ows_server/templates/semantic.kid 
    210215ows_server/templates/stubB.kid 
     
    229234ows_server/tests/functional/test_fetch.py 
    230235ows_server/tests/functional/test_retrieve.py 
     236ows_server/tests/functional/test_selection.py 
    231237ows_server/tests/functional/test_tabs.py 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server.egg-info/top_level.txt

    r2801 r2850  
    11ows_server 
     2ez_setup 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py

    r2848 r2850  
    179179            elif isinstance(e, ValueError): 
    180180                if e == '<p> Access Denied </p><p>Not Logged in</p>': 
    181                     c.msg=e 
    182                     #h.redirect_to('/login')   
    183                     return render_response('wcs_accessDenied', mimetype ='text/html')                     
     181                    c.xml='<div class="error">%s</div>'%e 
     182                    return render_response('error')               
    184183                else: 
    185184                    raise OWS_E.NoApplicableCode(e) 
     
    215214            elif isinstance(e, ValueError): 
    216215                if e.message == '<p> Access Denied </p><p>Not Logged in</p>': 
    217                     c.msg=e.message 
    218                     #h.redirect_to('/login')   
    219                     return render_response('wcs_accessDenied', mimetype ='text/html') 
     216                    c.xml='<div class="error">%s</div>'%e 
     217                    return render_response('error') 
    220218                else: 
    221219                    raise OWS_E.NoApplicableCode(e) 
     
    310308                secText=open(textName, 'w') 
    311309                if 'ndgSec' in session: 
    312                     securityinfo=str(session['ndgSec']) 
     310                    username=str(session['ndgSec']['u']) 
     311                    securityinfo=username 
    313312                else: 
    314313                    securityinfo='No Security' 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/fetch.py

    r2806 r2850  
    2222        input =open(textFilePath, 'r') 
    2323        sec=input.read() 
    24          
     24                 
    2525        #check current users credentials 
    2626        #if they match, return the file 
     
    2929            match=True #allow        
    3030        elif 'ndgSec' in session: 
    31             if sec == str(session['ndgSec']): 
     31            #if username matches 
     32            if sec == str(session['ndgSec']['u']): 
    3233                match=True #allow          
    3334            else: 
     
    5051        else: 
    5152            #return access denied message 
    52             return render_response('wcs_accessDenied', mimetype ='text/html') 
     53            c.xml='<div class="error">%s</div>'%'<p> Access Denied </p><p>Not Logged in</p>' 
     54            return render_response('error') 
    5355 
Note: See TracChangeset for help on using the changeset viewer.