Author: elecharny
Date: Wed Oct 31 15:23:19 2012
New Revision: 1404201
URL: http://svn.apache.org/viewvc?rev=1404201&view=rev
Log:
Some more table and code reformating
Modified:
mina/site/trunk/content/ftpserver/configuration_ssltls_support.mdtext
mina/site/trunk/content/ftpserver/configuration_user_manager_db.mdtext
mina/site/trunk/content/ftpserver/configuration_user_manager_file.mdtext
Modified: mina/site/trunk/content/ftpserver/configuration_ssltls_support.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver/configuration_ssltls_support.mdtext?rev=1404201&r1=1404200&r2=1404201&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver/configuration_ssltls_support.mdtext
(original)
+++ mina/site/trunk/content/ftpserver/configuration_ssltls_support.mdtext Wed
Oct 31 15:23:19 2012
@@ -31,19 +31,13 @@ In this mode server supports both secure
In this case, the listener should not use implicit SSL (the default value):
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE><nio-listener name="default"
implicit-ssl="false">
-</PRE>
-</DIV></DIV>
+ nio-listener name="default" implicit-ssl="false>
### Implicit Security
If you want to use implicit SSL connection, that is, SSL is always enabled on
the control socket. The first thing you need to do is to tell the listener to
use implicit SSL mode:
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE><nio-listener name="default"
implicit-ssl="true">
-</PRE>
-</DIV></DIV>
+ <nio-listener name="default" implicit-ssl="true">
If you set the listener to use implicit security, enabling implicit security
for the data connection should be conside
@@ -51,31 +45,15 @@ If you set the listener to use implicit
Implicit secure listener does not ensure encrypted data transfer. To use
SSL/TLS in data connection, client either has to send "PROT P" command or
implicit security must be enabled for the data connection.
-<DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE><data-connection implicit-ssl="true">
-</PRE>
-</DIV></DIV>
+ <data-connection implicit-ssl="true">
If no explicit configuration for SSL keystores and truststores is provided for
the data connection, it will be inherited from the listener. This is the normal
configuration.
Different FTP clients behave different with regards to implicit security on
the data connection, some assume an SSL enabled socket, while some will always
send a "PROT P" command. The following table shows the characteristics of some
clients, please report others.
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh">FTP client</TH>
-<TH class="confluenceTh"> Behavior </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> FileZilla </TD>
-<TD class="confluenceTd"> Sends "PROT P" command automatically in
implicit security mode </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> DartFTP/PowerTCP </TD>
-<TD class="confluenceTd"> Assumes an SSL enabled data connection, does not
send "PROT P" </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| FTP client | Behavior |
+| FileZilla | Sends "PROT P" command automatically in implicit security mode |
+| DartFTP/PowerTCP | Assumes an SSL enabled data connection, does not send
"PROT P" |
### Detailed configuration
Modified: mina/site/trunk/content/ftpserver/configuration_user_manager_db.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver/configuration_user_manager_db.mdtext?rev=1404201&r1=1404200&r2=1404201&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver/configuration_user_manager_db.mdtext
(original)
+++ mina/site/trunk/content/ftpserver/configuration_user_manager_db.mdtext Wed
Oct 31 15:23:19 2012
@@ -27,114 +27,66 @@ You must include the required JAR files
## Example
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
- <db-user-manager encrypt-passwords=<SPAN
class="code-quote">"salted"</SPAN>>
- <data-source>
- <beans:bean class=<SPAN
class="code-quote">"some.datasoure.class"</SPAN> />
- </data-source>
- <insert-user>INSERT INTO FTP_USER (userid, userpassword,
+ :::XML
+ <db-user-manager encrypt-passwords="salted">
+ <data-source>
+ <beans:bean class="some.datasoure.class" />
+ </data-source>
+ <insert-user>INSERT INTO FTP_USER (userid, userpassword,
homedirectory, enableflag, writepermission, idletime,
uploadrate,
downloadrate) VALUES ('{userid}', '{userpassword}',
'{homedirectory}',
'{enableflag}', '{writepermission}', {idletime},
{uploadrate},
- {downloadrate})</insert-user>
- <update-user>UPDATE FTP_USER SET
-
userpassword='{userpassword}',homedirectory='{homedirectory}',enableflag={enableflag},writepermission={writepermission},idletime={idletime},uploadrate={uploadrate},downloadrate={downloadrate}
- WHERE userid='{userid}'</update-user>
- <delete-user>DELETE FROM FTP_USER WHERE userid =
'{userid}'
- </delete-user>
- <select-user>SELECT userid, userpassword, homedirectory,
- enableflag, writepermission, idletime, uploadrate,
downloadrate FROM
- FTP_USER WHERE userid = '{userid}'</select-user>
- <select-all-users>SELECT userid FROM FTP_USER ORDER BY
userid
- </select-all-users>
- <is-admin>SELECT userid FROM FTP_USER WHERE
userid='{userid}' AND
- userid='admin'</is-admin>
- <authenticate>SELECT userpassword from FTP_USER WHERE
userid='{userid}'</authenticate>
- </db-user-manager>
-</PRE>
-</DIV></DIV>
+ {downloadrate})</insert-user>
+ <update-user>
+ UPDATE FTP_USER SET
+ userpassword='{userpassword}',
+ homedirectory='{homedirectory}',
+ enableflag={enableflag},
+ writepermission={writepermission},
+ idletime={idletime},
+ uploadrate={uploadrate},
+ downloadrate={downloadrate}
+ WHERE userid='{userid}'
+ </update-user>
+ <delete-user>
+ DELETE FROM FTP_USER WHERE userid = '{userid}'
+ </delete-user>
+ <select-user>
+ SELECT userid, userpassword, homedirectory,
+ enableflag, writepermission, idletime,
uploadrate, downloadrate
+ FROM FTP_USER
+ WHERE userid = '{userid}'
+ </select-user>
+ <select-all-users>
+ SELECT userid FROM FTP_USER ORDER BY userid
+ </select-all-users>
+ <is-admin>
+ SELECT userid
+ FROM FTP_USER
+ WHERE userid='{userid}' AND userid='admin'
+ </is-admin>
+ <authenticate>SELECT userpassword from FTP_USER WHERE
userid='{userid}'</authenticate>
+ </db-user-manager>
## Configuration Parameters
### db-user-manager element
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> encrypt-passwords </TD>
-<TD class="confluenceTd"> It indicates how to stored password are encrypted.
Possible values are "clear" for clear text, "md5" for
hashed using MD5 or "salted" for hashed salted passwords (including
multiple hash iterations). "salted" is encouraged. </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> md5 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
-
-
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Child element </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> data-source </TD>
-<TD class="confluenceTd"> The data source configured using the regular Spring
bean element </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> insert-user </TD>
-<TD class="confluenceTd"> The SQL statement to insert a new user. All the
dynamic values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> update-user </TD>
-<TD class="confluenceTd"> The SQL statement to update a user. All the dynamic
values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> delete-user </TD>
-<TD class="confluenceTd"> The SQL statement to delete a user. All the dynamic
values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> select-user </TD>
-<TD class="confluenceTd"> The SQL statement to select a user. All the dynamic
values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> select-all-users </TD>
-<TD class="confluenceTd"> The SQL statement to select all users. All the
dynamic values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> is-admin </TD>
-<TD class="confluenceTd"> The SQL statement to find whether an user is admin
or not. All the dynamic values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> authenticate </TD>
-<TD class="confluenceTd"> The SQL statement to authenticate a user. All the
dynamic values will be replaced during runtime. </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| Attribute | Description | Required | Default value |
+|---|---|---|---|
+| encrypt-passwords | It indicates how to stored password are encrypted.
Possible values are "clear" for clear text, "md5" for hashed using MD5 or
"salted" for hashed salted passwords (including multiple hash iterations).
"salted" is encouraged. | No | md5 |
+
+
+| Child element | Description | Required | Default value |
+|---|---|---|---|
+| data-source | The data source configured using the regular Spring bean
element | Yes | |
+| insert-user | The SQL statement to insert a new user. All the dynamic values
will be replaced during runtime. | Yes | |
+| update-user | The SQL statement to update a user. All the dynamic values
will be replaced during runtime. | Yes | |
+| delete-user | The SQL statement to delete a user. All the dynamic values
will be replaced during runtime. | Yes | |
+| select-user | The SQL statement to select a user. All the dynamic values
will be replaced during runtime. | Yes | |
+| select-all-users | The SQL statement to select all users. All the dynamic
values will be replaced during runtime. | Yes | |
+| is-admin | The SQL statement to find whether an user is admin or not. All
the dynamic values will be replaced during runtime. | Yes | |
+| authenticate | The SQL statement to authenticate a user. All the dynamic
values will be replaced during runtime. | Yes | |
### Data source configuration
@@ -142,80 +94,29 @@ The data source must be configured as de
#### Example using the BasicDataSource to connect to MySQL
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-<data-source>
- <beans:bean class=<SPAN
class="code-quote">"org.apache.commons.dbcp.BasicDataSource"</SPAN>>
- <beans:property name=<SPAN
class="code-quote">"driverClassName"</SPAN> value=<SPAN
class="code-quote">"com.mysql.jdbc.Driver"</SPAN> />
- <beans:property name=<SPAN
class="code-quote">"url"</SPAN> value=<SPAN
class="code-quote">"jdbc:mysql:<SPAN
class="code-comment">//localhost/ftpd"</SPAN> />
-</SPAN> <beans:property name=<SPAN
class="code-quote">"username"</SPAN> value=<SPAN
class="code-quote">"myuser"</SPAN> />
- <beans:property name=<SPAN
class="code-quote">"password"</SPAN> value=<SPAN
class="code-quote">"secret"</SPAN> />
- </beans:bean>
-</data-source>
-</PRE>
-</DIV></DIV>
+ <data-source>
+ <beans:bean class="org.apache.commons.dbcp.BasicDataSource">
+ <beans:property name="driverClassName"
value="com.mysql.jdbc.Driver" />
+ <beans:property name="url"
value="jdbc:mysql://localhost/ftpd" />
+ <beans:property name="username" value="myuser" />
+ <beans:property name="password" value="secret" />
+ </beans:bean>
+ </data-source>
#### FTP_USER Table Structure
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Column </TH>
-<TH class="confluenceTh"> Type </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> userid </TD>
-<TD class="confluenceTd"> VARCHAR(64), Primary key </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> userpassword </TD>
-<TD class="confluenceTd"> VARCHAR(64) </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> homedirectory </TD>
-<TD class="confluenceTd"> VARCHAR(128) </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> enableflag </TD>
-<TD class="confluenceTd"> BOOLEAN </TD>
-<TD class="confluenceTd"> TRUE </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> writepermission </TD>
-<TD class="confluenceTd"> BOOLEAN </TD>
-<TD class="confluenceTd"> FALSE </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> idletime </TD>
-<TD class="confluenceTd"> INT </TD>
-<TD class="confluenceTd"> 0 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> uploadrate </TD>
-<TD class="confluenceTd"> INT </TD>
-<TD class="confluenceTd"> 0 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> downloadrate </TD>
-<TD class="confluenceTd"> INT </TD>
-<TD class="confluenceTd"> 0 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> maxloginnumber </TD>
-<TD class="confluenceTd"> INT </TD>
-<TD class="confluenceTd"> 0 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> maxloginperip </TD>
-<TD class="confluenceTd"> INT </TD>
-<TD class="confluenceTd"> 0 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| Column | Type | Default value |
+|---|---|---|
+| userid | VARCHAR(64), Primary key | |
+| userpassword | VARCHAR(64) | |
+| homedirectory | VARCHAR(128) | |
+| enableflag | BOOLEAN | TRUE |
+| writepermission | BOOLEAN | FALSE |
+| idletime | INT | 0 |
+| uploadrate | INT | 0 |
+| downloadrate | INT | 0 |
+| maxloginnumber | INT | 0 |
+| maxloginperip | INT | 0 |
Modified:
mina/site/trunk/content/ftpserver/configuration_user_manager_file.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver/configuration_user_manager_file.mdtext?rev=1404201&r1=1404200&r2=1404201&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver/configuration_user_manager_file.mdtext
(original)
+++ mina/site/trunk/content/ftpserver/configuration_user_manager_file.mdtext
Wed Oct 31 15:23:19 2012
@@ -23,35 +23,13 @@ This is the default user manager. It use
## Example
-<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-<file-user-manager file=<SPAN
class="code-quote">"users.properties"</SPAN> encrypt-passwords=<SPAN
class="code-quote">"<SPAN class="code-keyword">true</SPAN>"</SPAN>
/>
-</PRE>
-</DIV></DIV>
+ <file-user-manager file="users.properties" encrypt-passwords="true">
## file-user-manager element
-<DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> file </TD>
-<TD class="confluenceTd"> Path to the properties file for storing users </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> encrypt-passwords </TD>
-<TD class="confluenceTd"> It indicates how to stored password are encrypted.
Possible values are "clear" for clear text, "md5" for
hashed using MD5 or "salted" for hashed salted passwords (including
multiple hash iterations). "salted" is encouraged. </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> md5 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV>
+| Attribute | Description | Required | Default value |
+|---|---|---|---|
+| file | Path to the properties file for storing users | Yes | |
+| encrypt-passwords | It indicates how to stored password are encrypted.
Possible values are "clear" for clear text, "md5" for hashed using MD5 or
"salted" for hashed salted passwords (including multiple hash iterations).
"salted" is encouraged. | No | md5 |
