Indefero Commit Details

Date:

2011-07-24 15:12:36 (14 years 3 months ago)

Author:

Patrick Georgi

Branch:

develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

945429abf0fea2f7bb0ab0171389fb7aa593cd87

Parents:

a016bcb51baec547c69a6b13217eb29e6e77e087

Message:

Provide MD5 value of downloads to HTTP client

Content-MD5 is a HTTP header to provide end-to-end integrity checks
(see RFC2616, 14.15). This doesn't protect against malicious
modifications, but against transmissions errors and storage errors
on the server.

The change also removes one redirect when downloading files.

Changes:

File differences

-150
151 151
152 152
153 
153
154 154
155 155
156 156
... ...
167 167
168 168
169 169
170
171
172
173
174
170 175
171 176
172 177
... ...
256 261
257 262
258 263
259 
264
+        if ($this->id == '') {␊
            $this->creation_dtime = gmdate('Y-m-d H:i:s');␊
            $this->modif_dtime = gmdate('Y-m-d H:i:s');␊
            $this->md5 = md5_file (Pluf::f('upload_path') . '/' . $this->get_project()->shortname . '/files/' . $this->file);␊
            $this->md5 = md5_file ($this->getFullPath());␊
        }␊
    }␊
␊

        return Pluf::f('url_upload').'/'.$project->shortname.'/files/'.$this->file;␊
    }␊
␊
    function getFullPath()␊
    {␊
        return(Pluf::f('upload_path').'/'.$this->get_project()->shortname.'/files/'.$this->file);␊
    }␊
␊
    /**␊
     * We drop the information from the timeline.␊
     */␊

        }␊
        Pluf_Translation::loadSetLocale($current_locale);␊
    }␊
}
}␊
 ...
 ...
         if ($this->id == '') {␊
             $this->creation_dtime = gmdate('Y-m-d H:i:s');␊
             $this->modif_dtime = gmdate('Y-m-d H:i:s');␊
-            $this->md5 = md5_file (Pluf::f('upload_path') . '/' . $this->get_project()->shortname . '/files/' . $this->file);␊
+            $this->md5 = md5_file ($this->getFullPath());␊
         }␊
     }␊
 ␊
         return Pluf::f('url_upload').'/'.$project->shortname.'/files/'.$this->file;␊
     }␊
 ␊
+    function getFullPath()␊
+    {␊
+        return(Pluf::f('upload_path').'/'.$this->get_project()->shortname.'/files/'.$this->file);␊
+    }␊
+␊
     /**␊
      * We drop the information from the timeline.␊
      */␊
         }␊
         Pluf_Translation::loadSetLocale($current_locale);␊
     }␊
-}
+}␊

-202
203 203
204 204
205 
205
206
207
208
209
206 210
207 211
208 212
+        $prj->inOr404($upload);␊
        $upload->downloads += 1;␊
        $upload->update();␊
        return new Pluf_HTTP_Response_Redirect($upload->getAbsoluteUrl($prj));␊
        $path = $upload->getFullPath();␊
        $mime = IDF_FileUtil::getMimeType($path);␊
        $render = new Pluf_HTTP_Response_File($path, $mime[0]);␊
        $render->headers["Content-MD5"] = $upload->md5;␊
        return $render;␊
    }␊
␊
    /**␊
         $prj->inOr404($upload);␊
         $upload->downloads += 1;␊
         $upload->update();␊
-        return new Pluf_HTTP_Response_Redirect($upload->getAbsoluteUrl($prj));␊
+        $path = $upload->getFullPath();␊
+        $mime = IDF_FileUtil::getMimeType($path);␊
+        $render = new Pluf_HTTP_Response_File($path, $mime[0]);␊
+        $render->headers["Content-MD5"] = $upload->md5;␊
+        return $render;␊
     }␊
 ␊
     /**␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags