mirror of
https://github.com/ysoftdevs/DependencyCheck.git
synced 2026-03-22 09:09:31 +01:00
updated copyright
This commit is contained in:
@@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Jeremy Long. All Rights Reserved.
|
* Copyright (c) 2015 OWASP. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
package org.owasp.dependencycheck.analyzer;
|
package org.owasp.dependencycheck.analyzer;
|
||||||
|
|
||||||
@@ -42,6 +42,7 @@ import java.security.MessageDigest;
|
|||||||
* @author colezlaw
|
* @author colezlaw
|
||||||
*/
|
*/
|
||||||
public class ComposerLockAnalyzer extends AbstractFileTypeAnalyzer {
|
public class ComposerLockAnalyzer extends AbstractFileTypeAnalyzer {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The logger
|
* The logger
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Jeremy Long. All Rights Reserved.
|
* Copyright (c) 2015 OWASP. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
package org.owasp.dependencycheck.data.composer;
|
package org.owasp.dependencycheck.data.composer;
|
||||||
|
|
||||||
@@ -23,13 +23,20 @@ package org.owasp.dependencycheck.data.composer;
|
|||||||
* @author colezlaw
|
* @author colezlaw
|
||||||
*/
|
*/
|
||||||
public final class ComposerDependency {
|
public final class ComposerDependency {
|
||||||
/** The group */
|
|
||||||
|
/**
|
||||||
|
* The group
|
||||||
|
*/
|
||||||
private final String group;
|
private final String group;
|
||||||
|
|
||||||
/** The project */
|
/**
|
||||||
|
* The project
|
||||||
|
*/
|
||||||
private final String project;
|
private final String project;
|
||||||
|
|
||||||
/** The version */
|
/**
|
||||||
|
* The version
|
||||||
|
*/
|
||||||
private final String version;
|
private final String version;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -13,17 +13,17 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Jeremy Long. All Rights Reserved.
|
* Copyright (c) 2015 OWASP. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
package org.owasp.dependencycheck.data.composer;
|
package org.owasp.dependencycheck.data.composer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents an exception when handling a composer.json or composer.lock
|
* Represents an exception when handling a composer.json or composer.lock file. Generally used to wrap a downstream exception.
|
||||||
* file. Generally used to wrap a downstream exception.
|
|
||||||
*
|
*
|
||||||
* @author colezlaw
|
* @author colezlaw
|
||||||
*/
|
*/
|
||||||
public class ComposerException extends RuntimeException {
|
public class ComposerException extends RuntimeException {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a ComposerException with default message.
|
* Creates a ComposerException with default message.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Jeremy Long. All Rights Reserved.
|
* Copyright (c) 2015 OWASP. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
package org.owasp.dependencycheck.data.composer;
|
package org.owasp.dependencycheck.data.composer;
|
||||||
|
|
||||||
@@ -36,16 +36,25 @@ import java.util.List;
|
|||||||
* @author colezlaw
|
* @author colezlaw
|
||||||
*/
|
*/
|
||||||
public class ComposerLockParser {
|
public class ComposerLockParser {
|
||||||
/** The JsonReader for parsing JSON */
|
|
||||||
|
/**
|
||||||
|
* The JsonReader for parsing JSON
|
||||||
|
*/
|
||||||
private final JsonReader jsonReader;
|
private final JsonReader jsonReader;
|
||||||
|
|
||||||
/** The input stream we'll read */
|
/**
|
||||||
|
* The input stream we'll read
|
||||||
|
*/
|
||||||
private final InputStream inputStream; // NOPMD - it gets set in the constructor, read later
|
private final InputStream inputStream; // NOPMD - it gets set in the constructor, read later
|
||||||
|
|
||||||
/** The List of ComposerDependencies found */
|
/**
|
||||||
|
* The List of ComposerDependencies found
|
||||||
|
*/
|
||||||
private final List<ComposerDependency> composerDependencies;
|
private final List<ComposerDependency> composerDependencies;
|
||||||
|
|
||||||
/** The LOGGER */
|
/**
|
||||||
|
* The LOGGER
|
||||||
|
*/
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(ComposerLockParser.class);
|
private static final Logger LOGGER = LoggerFactory.getLogger(ComposerLockParser.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Jeremy Long. All Rights Reserved.
|
* Copyright (c) 2015 OWASP. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
package org.owasp.dependencycheck.analyzer;
|
package org.owasp.dependencycheck.analyzer;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 Jeremy Long. All Rights Reserved.
|
* Copyright (c) 2015 OWASP. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
package org.owasp.dependencycheck.data.composer;
|
package org.owasp.dependencycheck.data.composer;
|
||||||
|
|
||||||
@@ -30,6 +30,7 @@ import static org.junit.Assert.*;
|
|||||||
* Created by colezlaw on 9/5/15.
|
* Created by colezlaw on 9/5/15.
|
||||||
*/
|
*/
|
||||||
public class ComposerLockParserTest {
|
public class ComposerLockParserTest {
|
||||||
|
|
||||||
private InputStream inputStream;
|
private InputStream inputStream;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
@@ -45,21 +46,21 @@ public class ComposerLockParserTest {
|
|||||||
assertTrue(clp.getDependencies().contains(new ComposerDependency("symfony", "translation", "2.7.3")));
|
assertTrue(clp.getDependencies().contains(new ComposerDependency("symfony", "translation", "2.7.3")));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected=ComposerException.class)
|
@Test(expected = ComposerException.class)
|
||||||
public void testNotJSON() throws Exception {
|
public void testNotJSON() throws Exception {
|
||||||
String input = "NOT VALID JSON";
|
String input = "NOT VALID JSON";
|
||||||
ComposerLockParser clp = new ComposerLockParser(new ByteArrayInputStream(input.getBytes(Charset.defaultCharset())));
|
ComposerLockParser clp = new ComposerLockParser(new ByteArrayInputStream(input.getBytes(Charset.defaultCharset())));
|
||||||
clp.process();
|
clp.process();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected=ComposerException.class)
|
@Test(expected = ComposerException.class)
|
||||||
public void testNotComposer() throws Exception {
|
public void testNotComposer() throws Exception {
|
||||||
String input = "[\"ham\",\"eggs\"]";
|
String input = "[\"ham\",\"eggs\"]";
|
||||||
ComposerLockParser clp = new ComposerLockParser(new ByteArrayInputStream(input.getBytes(Charset.defaultCharset())));
|
ComposerLockParser clp = new ComposerLockParser(new ByteArrayInputStream(input.getBytes(Charset.defaultCharset())));
|
||||||
clp.process();
|
clp.process();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected=ComposerException.class)
|
@Test(expected = ComposerException.class)
|
||||||
public void testNotPackagesArray() throws Exception {
|
public void testNotPackagesArray() throws Exception {
|
||||||
String input = "{\"packages\":\"eleventy\"}";
|
String input = "{\"packages\":\"eleventy\"}";
|
||||||
ComposerLockParser clp = new ComposerLockParser(new ByteArrayInputStream(input.getBytes(Charset.defaultCharset())));
|
ComposerLockParser clp = new ComposerLockParser(new ByteArrayInputStream(input.getBytes(Charset.defaultCharset())));
|
||||||
|
|||||||
Reference in New Issue
Block a user