Rev 1310 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1310 | Rev 1371 | ||
---|---|---|---|
Line 100... | Line 100... | ||
100 | FTPClient client = ftpServer.getClient(); |
100 | FTPClient client = ftpServer.getClient(); |
101 | if(client == null) |
101 | if(client == null) |
102 | { |
102 | { |
103 | //FALHOU PODE A PASS DO USER NAO DAR POR NAO ESTAR NO FTP |
103 | //FALHOU PODE A PASS DO USER NAO DAR POR NAO ESTAR NO FTP |
104 | //TEM DE VERIFICAR SE PODE USAR DEFAULTS QUANDO AUTENTICACAO FALHA |
104 | //TEM DE VERIFICAR SE PODE USAR DEFAULTS QUANDO AUTENTICACAO FALHA |
105 | if(userSession.getUsername() != null && |
105 | if(userSession != null && userSession.getUsername() != null && |
106 | ConfigProperties |
106 | ConfigProperties |
107 | .getBooleanProperty( |
107 | .getBooleanProperty( |
108 | server + ".use.default.credentials.to.read.if.user.fail.when.authenticated")) |
108 | server + ".use.default.credentials.to.read.if.user.fail.when.authenticated")) |
109 | { |
109 | { |
110 | // ESTA AUTENTICADO E TENTOU USAR A DO USER FALHOU, OU JA ESTA NA DEFAULT E FALHOU A MESMA |
110 | // ESTA AUTENTICADO E TENTOU USAR A DO USER FALHOU, OU JA ESTA NA DEFAULT E FALHOU A MESMA |
Line 119... | Line 119... | ||
119 | ,ConfigProperties.getProperty(server + ".user") |
119 | ,ConfigProperties.getProperty(server + ".user") |
120 | ,ConfigProperties.getProperty(server + ".pass")); |
120 | ,ConfigProperties.getProperty(server + ".pass")); |
121 | 121 | ||
122 | return ftpServer.getClient(); |
122 | return ftpServer.getClient(); |
123 | } |
123 | } |
124 | else if(userSession.getUsername() != null && |
124 | else if(userSession != null && userSession.getUsername() != null && |
125 | !ConfigProperties |
125 | !ConfigProperties |
126 | .getBooleanProperty( |
126 | .getBooleanProperty( |
127 | server + ".use.default.credentials.to.read.if.user.fail.when.authenticated")) |
127 | server + ".use.default.credentials.to.read.if.user.fail.when.authenticated")) |
128 | { |
128 | { |
129 | // USER AUTENTICADO FALHOU E SEM AUTORIZACAO PARA LIGAR COM AS DEFAULTS |
129 | // USER AUTENTICADO FALHOU E SEM AUTORIZACAO PARA LIGAR COM AS DEFAULTS |
Line 167... | Line 167... | ||
167 | } |
167 | } |
168 | 168 | ||
169 | if(path != null) |
169 | if(path != null) |
170 | { |
170 | { |
171 | 1.5.0/docs/api/java/lang/String.html">String serverUrl = pt.estgp.estgweb.utils.ConfigProperties.getProperty("server." + server); |
171 | 1.5.0/docs/api/java/lang/String.html">String serverUrl = pt.estgp.estgweb.utils.ConfigProperties.getProperty("server." + server); |
- | 172 | 1.5.0/docs/api/java/lang/String.html">String startPath = pt.estgp.estgweb.utils.ConfigProperties.getProperty("server." + server + ".start.path"); |
|
172 | 1.5.0/docs/api/java/lang/String.html">String remoteName = path.substring(path.lastIndexOf("/")+1); |
173 | 1.5.0/docs/api/java/lang/String.html">String remoteName = path.substring(path.lastIndexOf("/")+1); |
173 | 1.5.0/docs/api/java/lang/String.html">String remoteDirectory = path.substring(0,path.lastIndexOf("/")); |
174 | 1.5.0/docs/api/java/lang/String.html">String remoteDirectory = path.substring(0,path.lastIndexOf("/")); |
174 | FtpServer ftpServer = FtpServer.getNewServer(serverUrl,username,password); |
175 | FtpServer ftpServer = FtpServer.getNewServer(serverUrl,username,password); |
175 | FTPClient client = null; |
176 | FTPClient client = null; |
176 | try |
177 | try |
Line 180... | Line 181... | ||
180 | { |
181 | { |
181 | response.sendError(408); |
182 | response.sendError(408); |
182 | return; |
183 | return; |
183 | } |
184 | } |
184 | 185 | ||
- | 186 | if(startPath.length() > 0) |
|
- | 187 | { |
|
- | 188 | if(remoteDirectory.startsWith("/")) |
|
- | 189 | remoteDirectory = startPath + remoteDirectory; |
|
- | 190 | else |
|
- | 191 | remoteDirectory = startPath + "/" + remoteDirectory; |
|
- | 192 | } |
|
- | 193 | ||
- | 194 | ||
185 | client.changeWorkingDirectory(remoteDirectory); |
195 | client.changeWorkingDirectory(remoteDirectory); |
186 | 196 | ||
187 | 197 | ||
188 | 198 | ||
189 | FTPFile[] files = client.listFiles(); |
199 | FTPFile[] files = client.listFiles(); |