diff options
Diffstat (limited to 'tntconfig.cpp')
| -rw-r--r-- | tntconfig.cpp | 48 |
1 files changed, 42 insertions, 6 deletions
diff --git a/tntconfig.cpp b/tntconfig.cpp index 28ad521..9adab75 100644 --- a/tntconfig.cpp +++ b/tntconfig.cpp @@ -34,14 +34,33 @@ void TntConfig::WriteConfig() throw runtime_error( builder.str() ); } - // XXX modularize + // +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ + // ------------------------------------------------------------------------ + // These MapUrl statements are very security sensitive! + // A wrong mapping to content@ may allow retrieval of arbitrary files + // from your VDR system via live. + // Two meassures are taken against this in our implementation: + // 1. The MapUrls need to be checked regulary against possible exploits + // One tool to do this can be found here: + // http://www.lumadis.be/regex/test_regex.php + // Newly inserted MapUrls should be marked with author and confirmed + // by a second party. (use source code comments for this) + // 2. content.ecpp will be extended to validate paths it delivers to be + // a. relative to some given roots (default plugindir) + // b. not containing ../ paths components + // ------------------------------------------------------------------------ + // +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ + + file << "MapUrl ^/$ login@" << endl; // the following redirects vdr_request URL to the component // specified by the action parameter. + // inserted by 'tadi' -- verified with above, but not counterchecked yet! file << "MapUrl ^/vdr_request/([^.]+) $1@" << endl; // the following selects the theme specific 'theme.css' file + // inserted by 'tadi' -- verified with above, but not counterchecked yet! file << "MapUrl ^/themes/([^/]*)/css.*/(.+\\.css) content@ themes/$1/css/$2 text/css" << endl; // the following rules provide a search scheme for images. The first @@ -49,6 +68,7 @@ void TntConfig::WriteConfig() // 1. /themes/<theme>/img/<imgname>.<ext> // 2. /img/<imgname>.<ext> // 3. <imgname>.<ext> (builtin images) + // inserted by 'tadi' -- verified with above, but not counterchecked yet! file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) content@ themes/$1/img/$2.$3 image/$3" << endl; file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) content@ img/$2.$3 image/$3" << endl; file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) $2@" << endl; @@ -56,16 +76,32 @@ void TntConfig::WriteConfig() // Epg images string const epgImgPath(LiveSetup().GetEpgImageDir()); if (!epgImgPath.empty()) { - file << "MapUrl ^/epgimages/(.*)\\.(.+) content@ " << epgImgPath << "/$1.$2 image/$2" << endl; + // inserted by 'winni' -- EXPLOITABLE! (checked by tadi) + // file << "MapUrl ^/epgimages/(.*)\\.(.+) content@ " << epgImgPath << "/$1.$2 image/$2" << endl; + + // inserted by 'tadi' -- verified with above, but not counterchecked yet! + file << "MapUrl ^/epgimages/([^/]*)\\.([^./]+) content@ " << epgImgPath << "/$1.$2 image/$2" << endl; } // select additional (not build in) javascript. - file << "MapUrl ^/js([^.]*/)(.*\\.js) content@ js$1$2 text/javascript" << endl; + // WARNING: no path components with '.' in the name are allowed. Only + // the basename may contain dots and must end with '.js' + // inserted by 'tadi' -- verified with above, but not counterchecked yet! + file << "MapUrl ^/js(/[^.]*)([^/]*\\.js) content@ js$1$2 text/javascript" << endl; + // these map to 'css/basename(uri)' + // inserted by 'tadi' -- verified with above, but not counterchecked yet! file << "MapUrl ^/css.*/(.+) content@ css/$1 text/css" << endl; - file << "MapUrl ^/img.*/(.+\\.png) content@ css/$1 image/png" << endl; - file << "MapUrl /([^/]+/.+) content@ $1" << endl; - file << "MapUrl /([^.]+)(\\..+)? $1@" << endl; + file << "MapUrl ^/img.*/(.+)\\.([^.]+) content@ img/$1.$2 image/$2" << endl; + + // insecure by default: DO NOT UNKOMMENT!!! + // file << "MapUrl /([^/]+/.+) content@ $1" << endl; + + // takes first path components without 'extension' when it does not + // contain '.' + // modified by 'tadi' -- verified with above, but not counterchecked yet! + file << "MapUrl ^/([^./]+)(.*)? $1@" << endl; + file << "PropertyFile " << m_propertiesPath << endl; file << "SessionTimeout 86400" << endl; file << "DefaultContentType \"text/html; charset=" << LiveI18n().CharacterEncoding() << "\"" << endl; |