-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'aquasecurity:main' into main
- Loading branch information
Showing
15 changed files
with
296 additions
and
13 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
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
19 changes: 19 additions & 0 deletions
19
pkg/java/pom/testdata/no-parent-infinity-loop/parent/pom.xml
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,19 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>com.example</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>1.0.0</version> | ||
|
|
||
| <packaging>pom</packaging> | ||
| <name>parent</name> | ||
| <description>Parent</description> | ||
|
|
||
| <parent> | ||
| <groupId>org.example</groupId> | ||
| <artifactId>example-api</artifactId> | ||
| <version>1.7.30</version> | ||
| </parent> | ||
|
|
||
| </project> |
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,17 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>child</artifactId> | ||
|
|
||
| <name>child</name> | ||
| <description>Child</description> | ||
|
|
||
| <parent> | ||
| <groupId>com.example</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>1.0.0</version> | ||
| <relativePath>./parent</relativePath> | ||
| </parent> | ||
|
|
||
| </project> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package packagesprops | ||
|
|
||
| import ( | ||
| "encoding/xml" | ||
| "strings" | ||
|
|
||
| "golang.org/x/xerrors" | ||
|
|
||
| dio "github.com/aquasecurity/go-dep-parser/pkg/io" | ||
| "github.com/aquasecurity/go-dep-parser/pkg/types" | ||
| "github.com/aquasecurity/go-dep-parser/pkg/utils" | ||
| ) | ||
|
|
||
| type pkg struct { | ||
| Version string `xml:"Version,attr"` | ||
| UpdatePackageName string `xml:"Update,attr"` | ||
| IncludePackageName string `xml:"Include,attr"` | ||
| } | ||
|
|
||
| // https://github.com/dotnet/roslyn-tools/blob/b4c5220f5dfc4278847b6d38eff91cc1188f8066/src/RoslynInsertionTool/RoslynInsertionTool/CoreXT.cs#L150 | ||
| type itemGroup struct { | ||
| PackageReferenceEntry []pkg `xml:"PackageReference"` | ||
| PackageVersionEntry []pkg `xml:"PackageVersion"` | ||
| } | ||
|
|
||
| type project struct { | ||
| XMLName xml.Name `xml:"Project"` | ||
| ItemGroups []itemGroup `xml:"ItemGroup"` | ||
| } | ||
|
|
||
| type Parser struct{} | ||
|
|
||
| func NewParser() types.Parser { | ||
| return &Parser{} | ||
| } | ||
|
|
||
| func (p pkg) library() types.Library { | ||
| // Update attribute is considered legacy, so preferring Include | ||
| name := p.UpdatePackageName | ||
| if p.IncludePackageName != "" { | ||
| name = p.IncludePackageName | ||
| } | ||
|
|
||
| name = strings.TrimSpace(name) | ||
| version := strings.TrimSpace(p.Version) | ||
| return types.Library{ | ||
| ID: utils.PackageID(name, version), | ||
| Name: name, | ||
| Version: version, | ||
| } | ||
| } | ||
|
|
||
| func shouldSkipLib(lib types.Library) bool { | ||
| if len(lib.Name) == 0 || len(lib.Version) == 0 { | ||
| return true | ||
| } | ||
| // *packages.props files don't contain variable resolution information. | ||
| // So we need to skip them. | ||
| if isVariable(lib.Name) || isVariable(lib.Version) { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func isVariable(s string) bool { | ||
| return strings.HasPrefix(s, "$(") && strings.HasSuffix(s, ")") | ||
| } | ||
|
|
||
| func (p *Parser) Parse(r dio.ReadSeekerAt) ([]types.Library, []types.Dependency, error) { | ||
| var configData project | ||
| if err := xml.NewDecoder(r).Decode(&configData); err != nil { | ||
| return nil, nil, xerrors.Errorf("failed to decode '*.packages.props' file: %w", err) | ||
| } | ||
|
|
||
| var libs []types.Library | ||
| for _, item := range configData.ItemGroups { | ||
| for _, pkg := range append(item.PackageReferenceEntry, item.PackageVersionEntry...) { | ||
| lib := pkg.library() | ||
| if !shouldSkipLib(lib) { | ||
| libs = append(libs, lib) | ||
| } | ||
| } | ||
| } | ||
| return utils.UniqueLibraries(libs), nil, nil | ||
| } |
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,82 @@ | ||
| package packagesprops_test | ||
|
|
||
| import ( | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| config "github.com/aquasecurity/go-dep-parser/pkg/nuget/packagesprops" | ||
| "github.com/aquasecurity/go-dep-parser/pkg/types" | ||
| ) | ||
|
|
||
| func TestParse(t *testing.T) { | ||
| tests := []struct { | ||
| name string // Test input file | ||
| inputFile string | ||
| want []types.Library | ||
| wantErr string | ||
| }{ | ||
| { | ||
| name: "PackagesProps", | ||
| inputFile: "testdata/packages.props", | ||
| want: []types.Library{ | ||
| {Name: "Microsoft.Extensions.Configuration", Version: "2.1.1", ID: "[email protected]"}, | ||
| {Name: "Microsoft.Extensions.DependencyInjection.Abstractions", Version: "2.2.1", ID: "[email protected]"}, | ||
| {Name: "Microsoft.Extensions.Http", Version: "3.2.1", ID: "[email protected]"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "DirectoryPackagesProps", | ||
| inputFile: "testdata/Directory.Packages.props", | ||
| want: []types.Library{ | ||
| {Name: "PackageOne", Version: "6.2.3", ID: "[email protected]"}, | ||
| {Name: "PackageThree", Version: "2.4.1", ID: "[email protected]"}, | ||
| {Name: "PackageTwo", Version: "6.0.0", ID: "[email protected]"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "SeveralItemGroupElements", | ||
| inputFile: "testdata/several_item_groups", | ||
| want: []types.Library{ | ||
| {Name: "PackageOne", Version: "6.2.3", ID: "[email protected]"}, | ||
| {Name: "PackageThree", Version: "2.4.1", ID: "[email protected]"}, | ||
| {Name: "PackageTwo", Version: "6.0.0", ID: "[email protected]"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "VariablesAsNamesOrVersion", | ||
| inputFile: "testdata/variables_and_empty", | ||
| want: []types.Library{ | ||
| {Name: "PackageFour", Version: "2.4.1", ID: "[email protected]"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "NoItemGroupInXMLStructure", | ||
| inputFile: "testdata/no_item_group.props", | ||
| want: []types.Library(nil), | ||
| }, | ||
| { | ||
| name: "NoProject", | ||
| inputFile: "testdata/no_project.props", | ||
| wantErr: "failed to decode '*.packages.props' file", | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| f, err := os.Open(tt.inputFile) | ||
| require.NoError(t, err) | ||
|
|
||
| got, _, err := config.NewParser().Parse(f) | ||
| if tt.wantErr != "" { | ||
| require.NotNil(t, err) | ||
| assert.Contains(t, err.Error(), tt.wantErr) | ||
| return | ||
| } | ||
|
|
||
| assert.NoError(t, err) | ||
| assert.Equal(t, tt.want, got) | ||
| }) | ||
| } | ||
| } |
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,7 @@ | ||
| <Project> | ||
| <ItemGroup> | ||
| <PackageReference Include="PackageOne" Version=" 6.2.3" /> | ||
| <PackageReference Include="PackageTwo" Version="6.0.0" /> | ||
| <PackageReference Include="PackageThree " Version="2.4.1" /> | ||
| </ItemGroup> | ||
| </Project> |
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,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.1" /> | ||
| <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.1" /> | ||
| <PackageReference Update="Microsoft.Extensions.Http" Version="3.2.1" /> | ||
| <PackageReference WrongAttribute="Package1" Version="3.2.1" /> | ||
| <WrongEntry Update="Package2" Version="3.2.1" /> | ||
| <PackageReference Update="Package3" /> | ||
|
|
||
| </Project> |
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,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <ItemGroup Label="Microsoft Nugets"> | ||
| <PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.1" /> | ||
| <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.1" /> | ||
| <PackageReference Update="Microsoft.Extensions.Http" Version="3.2.1" /> | ||
| <PackageReference WrongAttribute="Package1" Version="3.2.1" /> | ||
| <WrongEntry Update="Package2" Version="3.2.1" /> | ||
| <PackageReference Update="Package3" /> | ||
| </ItemGroup> |
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,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="Microsoft Nugets"> | ||
| <PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.1" /> | ||
| <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.1" /> | ||
| <PackageReference Update="Microsoft.Extensions.Http" Version="3.2.1" /> | ||
| <PackageReference WrongAttribute="Package1" Version="3.2.1" /> | ||
| <WrongEntry Update="Package2" Version="3.2.1" /> | ||
| <PackageReference Update="Package3" /> | ||
| </ItemGroup> | ||
| </Project> |
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,10 @@ | ||
| <Project> | ||
| <ItemGroup> | ||
| <PackageReference Include="PackageOne" Version="6.2.3" /> | ||
| <PackageReference Include="PackageTwo" Version="6.0.0" /> | ||
|
|
||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="PackageThree" Version="2.4.1" /> | ||
| </ItemGroup> | ||
| </Project> |
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,9 @@ | ||
| <Project> | ||
| <ItemGroup> | ||
| <PackageReference Include="PackageOne" Version="$(Variable1)" /> | ||
| <PackageReference Include="$(variable2)" Version="6.0.0" /> | ||
| <PackageReference Include="" Version="2.4.1" /> | ||
| <PackageReference Include="package" Version="" /> | ||
| <PackageReference Include="PackageFour" Version="2.4.1" /> | ||
| </ItemGroup> | ||
| </Project> |