Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SMB v. 2 / 3 integration based on SMBJ #26

Open
wants to merge 21 commits into
base: trunk
Choose a base branch
from
Open

SMB v. 2 / 3 integration based on SMBJ #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
63a1fb2
Adding classes for smb2 / 3 implementation using SMBJ
Nov 5, 2017
831deed
FileNameParser somehow made it to the gitignore
Nov 5, 2017
e1db1f1
Wrap InputStream to close File Handle as well
ahbonsu Nov 6, 2017
3010dcb
FileObject closeAllHandles method set handles null after closing
ahbonsu Nov 6, 2017
5725ed8
Test m2e git plugin
ahbonsu Nov 6, 2017
2d641d0
Code cleanup & add comments where needed
ahbonsu Nov 6, 2017
6e9b10e
Folder move & rename fixed
ahbonsu Nov 6, 2017
d48237c
Rename SMB 3 -> 2 (used while prototyping)
ahbonsu Nov 6, 2017
ac7639c
Added SMB Config default: DFS enabled, Multiprotocol-Negotiation
ahbonsu Nov 8, 2017
a737d58
Adding separate method to delete a folder
ahbonsu Nov 9, 2017
0a58ac2
Added ProviderTestCase
ahbonsu Nov 9, 2017
0e74e8a
SMB2FileName added to keep the share - name in the root(uri).
ahbonsu Nov 10, 2017
eb0e61e
doDetach sets fileInfo to null
ahbonsu Nov 13, 2017
14b3cc6
Override getURI to get correct URI including share
ahbonsu Nov 13, 2017
9638d9c
Using URIParse instead of URLEncoder/URLDecoder
ahbonsu Nov 13, 2017
b15551c
clean
ahbonsu Nov 13, 2017
7b511b0
Restored original pom.xml and removed smb2 test class
ahbonsu Nov 16, 2017
d13d982
Fix: SmbConfig accidentally overwritten
ahbonsu Nov 20, 2017
688a290
Changed Write-Access from GENERIC_ALL to MAXIMUM_ALLOWED. GENERIC_ALL
ahbonsu Nov 21, 2017
d0c5244
Fix: Atomar reference
ahbonsu Nov 22, 2017
db27fbe
Added TestCase but as excluded
ahbonsu Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion commons-vfs2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
<!-- Test SFTP with Apache SHHd Server (MINA) -->
<dependency>
Expand Down Expand Up @@ -135,6 +134,18 @@
<artifactId>jackrabbit-standalone</artifactId>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.hierynomus/smbj -->
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>smbj</artifactId>
<version>0.5.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just no.

<version>1.5.11</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just no.

</dependency>
<!-- Test HDFS with Apache Hadoop -->
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand Down Expand Up @@ -256,6 +267,15 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/SMB2ProviderTestCase.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
7 changes: 7 additions & 0 deletions commons-vfs2/src/main/java/org/apache/commons/vfs2/Resources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,13 @@ vfs.provider.temp/missing-share-name.error=Share name missing from UNC file name
vfs.provider.smb/missing-share-name.error=The share name is missing from URI "{0}".
vfs.provider.smb/get-type.error=Could not detemine the type of "{0}".

# SMB2 Provider
vfs.provider.smb2/missing-share-name.error=The share name is missing from URI "{0}".
vfs.provider.smb2/share-path-extraction.error=Share name extraction failed for path "{0}".
vfs.provider.smb2/connect.error=Could not establish connection to "{0}".
vfs.provider.smb2/folder-create.error=Could not create folder "{0}".
vfs.provider.smb2/diskentry-create.error=Could not create a handle for file "{0}".

# Zip Provider
vfs.provider.zip/open-zip-file.error=Could not open Zip file "{0}".
vfs.provider.zip/close-zip-file.error=Could not close Zip file "{0}".
Expand Down
257 changes: 119 additions & 138 deletions commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/providers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,144 +1,125 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You completely broke formatting.

license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<providers>
<default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider">
</default-provider>
<provider class-name="org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider">
<scheme name="file"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.zip.ZipFileProvider">
<scheme name="zip"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.tar.TarFileProvider">
<scheme name="tar"/>
<if-available class-name="org.apache.commons.compress.archivers.tar.TarArchiveOutputStream"/>
</provider>
<default-provider
class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider">
</default-provider>
<provider
class-name="org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider">
<scheme name="file" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.zip.ZipFileProvider">
<scheme name="zip" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.tar.TarFileProvider">
<scheme name="tar" />
<if-available
class-name="org.apache.commons.compress.archivers.tar.TarArchiveOutputStream" />
</provider>

<provider class-name="org.apache.commons.vfs2.provider.bzip2.Bzip2FileProvider">
<scheme name="bz2" />
<if-available
class-name="org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.gzip.GzipFileProvider">
<scheme name="gz" />
</provider>

<provider class-name="org.apache.commons.vfs2.provider.bzip2.Bzip2FileProvider">
<scheme name="bz2"/>
<if-available class-name="org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.gzip.GzipFileProvider">
<scheme name="gz"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.jar.JarFileProvider">
<scheme name="jar" />
<scheme name="sar" />
<scheme name="ear" />
<scheme name="par" />
<scheme name="ejb3" />
<scheme name="war" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.temp.TemporaryFileProvider">
<scheme name="tmp" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider">
<scheme name="ftp" />
<if-available class-name="org.apache.commons.net.ftp.FTPFile" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.ftps.FtpsFileProvider">
<scheme name="ftps" />
<if-available class-name="org.apache.commons.net.ftp.FTPFile" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.http.HttpFileProvider">
<scheme name="http" />
<if-available class-name="org.apache.commons.httpclient.HttpClient" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.https.HttpsFileProvider">
<scheme name="https" />
<if-available class-name="org.apache.commons.httpclient.HttpClient" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.sftp.SftpFileProvider">
<scheme name="sftp" />
<if-available class-name="javax.crypto.Cipher" />
<if-available class-name="com.jcraft.jsch.JSch" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.res.ResourceFileProvider">
<scheme name="res" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.webdav.WebdavFileProvider">
<scheme name="webdav" />
<if-available class-name="org.apache.commons.httpclient.HttpClient" />
<if-available class-name="org.apache.jackrabbit.webdav.client.methods.DavMethod" />
</provider>
<!-- <provider class-name="org.apache.commons.vfs2.provider.svn.SvnFileProvider">
<scheme name="svnhttps"/> </provider> -->
<!-- <provider class-name="org.apache.commons.vfs2.provider.tar.TgzFileProvider">
<scheme name="tgz"/> <if-available scheme="gz"/> <if-available scheme="tar"/>
</provider> <provider class-name="org.apache.commons.vfs2.provider.tar.Tbz2FileProvider">
<scheme name="tbz2"/> <if-available scheme="bz2"/> <if-available scheme="tar"/>
</provider> -->
<provider class-name="org.apache.commons.vfs2.provider.tar.TarFileProvider">
<scheme name="tgz" />
<if-available scheme="gz" />
<if-available scheme="tar" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.tar.TarFileProvider">
<scheme name="tbz2" />
<if-available scheme="bz2" />
<if-available scheme="tar" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.ram.RamFileProvider">
<scheme name="ram" />
</provider>
<provider class-name="org.apache.commons.vfs2.provider.hdfs.HdfsFileProvider">
<scheme name="hdfs" />
<if-available class-name="org.apache.hadoop.fs.FileSystem" />
</provider>

<provider class-name="org.apache.commons.vfs2.provider.jar.JarFileProvider">
<scheme name="jar"/>
<scheme name="sar"/>
<scheme name="ear"/>
<scheme name="par"/>
<scheme name="ejb3"/>
<scheme name="war"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.temp.TemporaryFileProvider">
<scheme name="tmp"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider">
<scheme name="ftp"/>
<if-available class-name="org.apache.commons.net.ftp.FTPFile"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.ftps.FtpsFileProvider">
<scheme name="ftps"/>
<if-available class-name="org.apache.commons.net.ftp.FTPFile"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.http.HttpFileProvider">
<scheme name="http"/>
<if-available class-name="org.apache.commons.httpclient.HttpClient"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.https.HttpsFileProvider">
<scheme name="https"/>
<if-available class-name="org.apache.commons.httpclient.HttpClient"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.sftp.SftpFileProvider">
<scheme name="sftp"/>
<if-available class-name="javax.crypto.Cipher"/>
<if-available class-name="com.jcraft.jsch.JSch"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.res.ResourceFileProvider">
<scheme name="res"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.webdav.WebdavFileProvider">
<scheme name="webdav"/>
<if-available class-name="org.apache.commons.httpclient.HttpClient"/>
<if-available class-name="org.apache.jackrabbit.webdav.client.methods.DavMethod"/>
</provider>
<!--
<provider class-name="org.apache.commons.vfs2.provider.svn.SvnFileProvider">
<scheme name="svnhttps"/>
</provider>
-->
<!--
<provider class-name="org.apache.commons.vfs2.provider.tar.TgzFileProvider">
<scheme name="tgz"/>
<if-available scheme="gz"/>
<if-available scheme="tar"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.tar.Tbz2FileProvider">
<scheme name="tbz2"/>
<if-available scheme="bz2"/>
<if-available scheme="tar"/>
</provider>
-->
<provider class-name="org.apache.commons.vfs2.provider.tar.TarFileProvider">
<scheme name="tgz"/>
<if-available scheme="gz"/>
<if-available scheme="tar"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.tar.TarFileProvider">
<scheme name="tbz2"/>
<if-available scheme="bz2"/>
<if-available scheme="tar"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.ram.RamFileProvider">
<scheme name="ram"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.hdfs.HdfsFileProvider">
<scheme name="hdfs"/>
<if-available class-name="org.apache.hadoop.fs.FileSystem"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.smb2.SMB2FileProvider">
<scheme name="smb2" />
</provider>

<extension-map extension="zip" scheme="zip"/>
<extension-map extension="tar" scheme="tar"/>
<mime-type-map mime-type="application/zip" scheme="zip"/>
<mime-type-map mime-type="application/x-tar" scheme="tar"/>
<mime-type-map mime-type="application/x-gzip" scheme="gz"/>
<!--
<mime-type-map mime-type="application/x-tgz" scheme="tgz"/>
-->
<extension-map extension="jar" scheme="jar"/>
<extension-map extension="bz2" scheme="bz2"/>
<extension-map extension="gz" scheme="gz"/>
<!--
<extension-map extension="tgz" scheme="tgz"/>
<extension-map extension="tbz2" scheme="tbz2"/>
-->
<extension-map extension="tgz" scheme="tar"/>
<extension-map extension="tbz2" scheme="tar"/>
<extension-map extension="zip" scheme="zip" />
<extension-map extension="tar" scheme="tar" />
<mime-type-map mime-type="application/zip" scheme="zip" />
<mime-type-map mime-type="application/x-tar" scheme="tar" />
<mime-type-map mime-type="application/x-gzip" scheme="gz" />
<!-- <mime-type-map mime-type="application/x-tgz" scheme="tgz"/> -->
<extension-map extension="jar" scheme="jar" />
<extension-map extension="bz2" scheme="bz2" />
<extension-map extension="gz" scheme="gz" />
<!-- <extension-map extension="tgz" scheme="tgz"/> <extension-map extension="tbz2"
scheme="tbz2"/> -->
<extension-map extension="tgz" scheme="tar" />
<extension-map extension="tbz2" scheme="tar" />

<!--
<filter-map class-name="org.apache.commons.vfs2.content.bzip2.Bzip2Compress">
<extension name="bz2"/>
<extension name="tbz2"/>
<if-available class-name="org.apache.commons.compress.bzip2.CBZip2InputStream"/>
</filter-map>
<filter-map class-name="org.apache.commons.vfs2.content.gzip.GzipCompress">
<extension name="gz"/>
<extension name="tgz"/>
<mime-type name="application/x-tgz" />
</filter-map>
-->
<!-- <filter-map class-name="org.apache.commons.vfs2.content.bzip2.Bzip2Compress">
<extension name="bz2"/> <extension name="tbz2"/> <if-available class-name="org.apache.commons.compress.bzip2.CBZip2InputStream"/>
</filter-map> <filter-map class-name="org.apache.commons.vfs2.content.gzip.GzipCompress">
<extension name="gz"/> <extension name="tgz"/> <mime-type name="application/x-tgz"
/> </filter-map> -->
</providers>
1 change: 1 addition & 0 deletions commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/smb2/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/SMB3FileNameParser.java
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

Loading