[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: Review Request 116524: Make kio_ftp work with ftp server that don't support absolute path with S
From: "Dawit Alemayehu" <adawit () kde ! org>
Date: 2014-03-12 4:13:54
Message-ID: 20140312041354.3142.32588 () probe ! kde ! org
[Download RAW message or body]
> On March 5, 2014, 7:47 a.m., David Faure wrote:
> > kioslave/ftp/ftp.cpp, line 2275
> > <https://git.reviewboard.kde.org/r/116524/diff/2/?file=251597#file251597line2275>
> >
> > This is surely wrong.
> >
> > If you're in /home/dfaure (as the CWD would be, by default, on non-anonymous FTP)
> > and you're downloading a file /home/dfaure/dir1/dir2/file.txt
> > then surely you want to call
> >
> > SIZE dir1/dir2/file.txt
> >
> > and not
> >
> > SIZE home/dfaure/dir1/dir2/file.txt
> >
> >
> > It has to be relative to the CWD, not just "skip the first slash", which only \
> > works if the CWD is "/".
> >
> > This gives two alternatives for the fix: make this code relative to the current \
> > CWD whatever it is, or call ftpFolder() with the directory name (e.g. \
> > /home/dfaure/dir1/dir2) followed by SIZE with just the filename. The latter \
> > sounds like it might work better on android (if it doesn't support absolute \
> > paths, maybe it doesn't support ../../foo/bar.txt either?).
>
> Dawit Alemayehu wrote:
> I have not been able to test whether it supported ../../foo/bar.txt yet. However, \
> making the code relative to m_currentPath seems to work just fine ; so I can avoid \
> having to call ftpFolder and hence sending a cwd request.
I am done testing this patch and it seems to work with a bunch of different ftp \
servers I tried so far. I tested with whatever ftp.kde.org runs, the android ftp \
server that was the source of this fix and both pro-ftpd and vsftpd servers on my own \
machines. If there are no objections, I am going to commit this after the beta2 is \
out ; so it can go in for the next beta release.
- Dawit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/116524/#review52013
-----------------------------------------------------------
On March 7, 2014, 6:48 a.m., Dawit Alemayehu wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/116524/
> -----------------------------------------------------------
>
> (Updated March 7, 2014, 6:48 a.m.)
>
>
> Review request for kdelibs and David Faure.
>
>
> Bugs: 326292
> http://bugs.kde.org/show_bug.cgi?id=326292
>
>
> Repository: kdelibs
>
>
> Description
> -------
>
> This patch changes Ftp::ftpSize such that it has support for servers that do not \
> allow absolute paths with the SIZE command. That means when sending the command \
> "SIZE /somefile" fails, it will try sending "SIZE somefile" before giving up. See \
> bug report for details.
>
> Diffs
> -----
>
> kioslave/ftp/ftp.cpp ddc6eaf
>
> Diff: https://git.reviewboard.kde.org/r/116524/diff/
>
>
> Testing
> -------
>
> Installed Ftp server from bug report on an Android device and run tests.
>
>
> Thanks,
>
> Dawit Alemayehu
>
>
[Attachment #3 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/116524/">https://git.reviewboard.kde.org/r/116524/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On March 5th, 2014, 7:47 a.m. UTC, <b>David \
Faure</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/116524/diff/2/?file=251597#file251597line2275" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kioslave/ftp/ftp.cpp</a> <span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">bool \
Ftp::ftpSize( const QString & path, char mode )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">2275</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">buf</span> <span class="o">+=</span> <span \
class="n">remoteEncoding</span><span class="p">()</span><span \
class="o">-></span><span class="n">encode</span><span class="p">(</span><span \
class="n">path</span><span class="p">.</span><span class="n">mid</span><span \
class="p">(</span><span class="mi">1</span><span class="p">));</span></pre></td> \
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This is surely wrong.
If you're in /home/dfaure (as the CWD would be, by default, on non-anonymous FTP)
and you're downloading a file /home/dfaure/dir1/dir2/file.txt
then surely you want to call
SIZE dir1/dir2/file.txt
and not
SIZE home/dfaure/dir1/dir2/file.txt
It has to be relative to the CWD, not just "skip the first slash", which \
only works if the CWD is "/".
This gives two alternatives for the fix: make this code relative to the current CWD \
whatever it is, or call ftpFolder() with the directory name (e.g. \
/home/dfaure/dir1/dir2) followed by SIZE with just the filename. The latter sounds \
like it might work better on android (if it doesn't support absolute paths, maybe \
it doesn't support ../../foo/bar.txt either?).</pre> </blockquote>
<p>On March 7th, 2014, 6:44 a.m. UTC, <b>Dawit Alemayehu</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I have not been able to \
test whether it supported ../../foo/bar.txt yet. However, making the code relative to \
m_currentPath seems to work just fine ; so I can avoid having to call ftpFolder and \
hence sending a cwd request.</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I am done \
testing this patch and it seems to work with a bunch of different ftp servers I tried \
so far. I tested with whatever ftp.kde.org runs, the android ftp server that was the \
source of this fix and both pro-ftpd and vsftpd servers on my own machines. If there \
are no objections, I am going to commit this after the beta2 is out ; so it can go in \
for the next beta release.</pre> <br />
<p>- Dawit</p>
<br />
<p>On March 7th, 2014, 6:48 a.m. UTC, Dawit Alemayehu wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for kdelibs and David Faure.</div>
<div>By Dawit Alemayehu.</div>
<p style="color: grey;"><i>Updated March 7, 2014, 6:48 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="http://bugs.kde.org/show_bug.cgi?id=326292">326292</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdelibs
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">This patch changes Ftp::ftpSize such that it has support for servers \
that do not allow absolute paths with the SIZE command. That means when sending the \
command "SIZE /somefile" fails, it will try sending "SIZE \
somefile" before giving up. See bug report for details.
</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Installed Ftp server from bug report on an Android device and run \
tests.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kioslave/ftp/ftp.cpp <span style="color: grey">(ddc6eaf)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/116524/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic