-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
implement changes based on PR feedback
Polish code, remove spaces Polish code, remove unused method Revert last change Improve design, rename, refactor some classes Implement recursion limiter Improve JUnit test, follow test framework default utilities Polish code, fix typos, consistent variable names Refactor JUnit test to support Jcif testing framework Add support for resolving relative symlinks Increase coverage of unit tests for relative symlinks
- Loading branch information
Showing
8 changed files
with
460 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
src/main/java/jcifs/internal/smb2/Smb2ErrorDataFormat.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| /* | ||
| * © 2022 AgNO3 Gmbh & Co. KG | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| */ | ||
| package jcifs.internal.smb2; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import jcifs.internal.SMBProtocolDecodingException; | ||
| import jcifs.internal.util.SMBUtil; | ||
| import jcifs.util.Strings; | ||
|
|
||
| /** | ||
| * 2.2.2.2 ErrorData format | ||
| * | ||
| * Defines methods to decode a SMB2 ErrorData format byte array. | ||
| * | ||
| * @author Gregory Bragg | ||
| */ | ||
| public class Smb2ErrorDataFormat extends Smb2ErrorContextResponse { | ||
|
|
||
| private boolean absolutePath; | ||
| private String substituteName; | ||
| private String printName; | ||
|
|
||
| @Override | ||
| public int readSymLinkErrorResponse ( byte[] buffer) throws SMBProtocolDecodingException { | ||
| int bufferIndex = super.readErrorContextResponse(buffer); | ||
| if ( this.errorId != 0 ) { | ||
| throw new SMBProtocolDecodingException("ErrorId should be 0 for STATUS_STOPPED_ON_SYMLINK"); | ||
| } | ||
|
|
||
| // SymLinkLength (4 bytes) | ||
| int symLinkLength = SMBUtil.readInt4(buffer, bufferIndex); | ||
| bufferIndex += 4; | ||
|
|
||
| // SymLinkErrorTag (4 bytes) (always 0x4C4D5953) | ||
| int symLinkErrorTag = SMBUtil.readInt4(buffer, bufferIndex); | ||
| if ( !Integer.toHexString(symLinkErrorTag).toUpperCase().equals("4C4D5953") ) { | ||
| throw new SMBProtocolDecodingException("SymLinkErrorTag should be 0x4C4D5953"); | ||
| } | ||
| bufferIndex += 4; | ||
|
|
||
| // ReparseTag (4 bytes) (always 0xA000000C) | ||
| int reparseTag = SMBUtil.readInt4(buffer, bufferIndex); | ||
| if ( !Integer.toHexString(reparseTag).toUpperCase().equals("A000000C") ) { | ||
| throw new SMBProtocolDecodingException("ReparseTag should be 0xA000000C"); | ||
| } | ||
| bufferIndex += 4; | ||
|
|
||
| // ReparseDataLength (2 bytes) | ||
| int reparsedPathLength = SMBUtil.readInt2(buffer, bufferIndex); | ||
| bufferIndex += 2; | ||
|
|
||
| // UnparsedPathLength (2 bytes) | ||
| int unparsedPathLength = SMBUtil.readInt2(buffer, bufferIndex); | ||
| bufferIndex += 2; | ||
|
|
||
| // SubstituteNameOffset (2 bytes) | ||
| int substituteNameOffset = SMBUtil.readInt2(buffer, bufferIndex); | ||
| bufferIndex += 2; | ||
|
|
||
| // SubstituteNameLength (2 bytes) | ||
| int substituteNameLength = SMBUtil.readInt2(buffer, bufferIndex); | ||
| bufferIndex += 2; | ||
|
|
||
| // PrintNameOffset (2 bytes) | ||
| int printNameOffset = SMBUtil.readInt2(buffer, bufferIndex); | ||
| bufferIndex += 2; | ||
|
|
||
| // PrintNameLength (2 bytes) | ||
| int printNameLength = SMBUtil.readInt2(buffer, bufferIndex); | ||
| bufferIndex += 2; | ||
|
|
||
| // Flags (4 bytes) A 32-bit bit field that specifies whether the substitute is an absolute target path name | ||
| // or a path name relative to the directory containing the symbolic link. | ||
| // We only read the first 2 bytes to get the value, either 0x00000000 or 0x00000001 (0 or 1). | ||
| this.absolutePath = SMBUtil.readInt2(buffer, bufferIndex) == 0; | ||
| bufferIndex += 4; | ||
|
|
||
| // PathBuffer (variable), substitute name | ||
| this.substituteName = Strings.fromUNIBytes(buffer, substituteNameOffset + bufferIndex, substituteNameLength); | ||
|
|
||
| // PathBuffer (variable), print name that also identifies the target of the symbolic link | ||
| this.printName = Strings.fromUNIBytes(buffer, printNameOffset + bufferIndex, printNameLength); | ||
|
|
||
| return symLinkLength; | ||
| } | ||
|
|
||
|
|
||
| public String normalizeSymLinkPath(String path) { | ||
| List<String> parts = Strings.split(path, '\\'); | ||
|
|
||
| for (int i = 0; i < parts.size(); ) { | ||
| String s = parts.get(i); | ||
| if (".".equals(s)) { | ||
| parts.remove(i); | ||
| } else if ("..".equals(s)) { | ||
| if (i > 0) { | ||
| parts.remove(i--); | ||
| } | ||
| parts.remove(i); | ||
| } else { | ||
| i++; | ||
| } | ||
| } | ||
|
|
||
| return Strings.join(parts, '\\'); | ||
| } | ||
|
|
||
|
|
||
| public int getErrorDataLength () { | ||
| return this.errorDataLength; | ||
| } | ||
|
|
||
| public int getErrorId () { | ||
| return this.errorId; | ||
| } | ||
|
|
||
| public boolean isAbsolutePath () { | ||
| return this.absolutePath; | ||
| } | ||
|
|
||
| public String getSubstituteName () { | ||
| return this.substituteName; | ||
| } | ||
|
|
||
| public String getPrintName () { | ||
| return this.printName; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public int readShareRedirectErrorContextResponse(byte[] buffer) | ||
| throws SMBProtocolDecodingException { | ||
| throw new UnsupportedOperationException("Not implemented"); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * © 2022 AgNO3 Gmbh & Co. KG | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| */ | ||
| package jcifs.internal.util; | ||
|
|
||
| /** | ||
| * Import static and insert emerge() call into the beginning of any method in your code that can be | ||
| * deeply recursive. You can adjust maximum allowed recursion level via the maxLevel variable. The | ||
| * emerge() procedure will interrupt execution on a level greater than the value of that variable. | ||
| * You can switch off this behavior by setting maxLevel to 0. | ||
| * | ||
| * This solution is thread-safe because it doesn't use any counter at all. | ||
| */ | ||
| public class RecursionLimiter { | ||
| public static int maxLevel = 50; | ||
|
|
||
| public static void emerge() { | ||
| if (maxLevel == 0) | ||
| return; | ||
| try { | ||
| throw new IllegalStateException("Too deep, emerging"); | ||
| } catch (IllegalStateException e) { | ||
| if (e.getStackTrace().length > maxLevel + 1) | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.