Skip to content

Commit

Permalink
Use more actions (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cugu
cugu committed Aug 7, 2021
1 parent a4d9a2a commit 0944d2a
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 27 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/ci.yml
View file
Expand Up @@ -24,28 +24,27 @@ jobs:
- name: Download dependencies
run: go mod download

- name: Install golangci-lint & go-acc
run: |
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.36.0
go get -u github.com/ory/go-acc
shell: bash

- name: Lint
run: golangci-lint run --verbose --config .github/.golangci.yml
uses: golangci/golangci-lint-action@v2
with:
version: latest
args: --verbose --config .github/.golangci.yml --enable gofmt --enable goimports
if: matrix.os != 'windows-latest'
- name: Lint Windows
run: golangci-lint run --verbose --config .github/.golangci.yml --disable gofmt --disable goimports
uses: golangci/golangci-lint-action@v2
with:
version: latest
args: --verbose --config .github/.golangci.yml
if: matrix.os == 'windows-latest'

- name: Test
run: go-acc ./...
run: go test -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic .
shell: bash
- name: Upload coverage
env:
CI: "true"
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
run: bash <(curl -s https://codecov.io/bash)
uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODECOV_TOKEN }}
if: matrix.os == 'windows-latest'
shell: bash

fs:
name: fs
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -1,3 +1,4 @@
.idea
.DS_Store
dist
coverage.txt
92 changes: 89 additions & 3 deletions cmd/fs/main_test.go
View file
Expand Up @@ -208,12 +208,98 @@ func Test_tree(t *testing.T) {
├── document
│ ├── Computer forensics - Wikipedia.pdf
│ ├── Design_of_the_FAT_file_system.xlsx
│ │ └── [Content_Types].xml
│ │ ├── [Content_Types].xml
│ │ ├── _rels
│ │ │ └── .rels
│ │ ├── docProps
│ │ │ ├── app.xml
│ │ │ └── core.xml
│ │ └── xl
│ │ ├── _rels
│ │ │ └── workbook.xml.rels
│ │ ├── printerSettings
│ │ │ └── printerSettings1.bin
│ │ ├── sharedStrings.xml
│ │ ├── styles.xml
│ │ ├── theme
│ │ │ └── theme1.xml
│ │ ├── workbook.xml
│ │ └── worksheets
│ │ ├── _rels
│ │ │ └── sheet1.xml.rels
│ │ └── sheet1.xml
│ ├── Digital forensics.docx
│ │ └── [Content_Types].xml
│ │ ├── [Content_Types].xml
│ │ ├── _rels
│ │ │ └── .rels
│ │ ├── docProps
│ │ │ ├── app.xml
│ │ │ └── core.xml
│ │ └── word
│ │ ├── _rels
│ │ │ └── document.xml.rels
│ │ ├── document.xml
│ │ ├── fontTable.xml
│ │ ├── media
│ │ │ └── image1.jpeg
│ │ ├── numbering.xml
│ │ ├── settings.xml
│ │ ├── styles.xml
│ │ ├── theme
│ │ │ └── theme1.xml
│ │ └── webSettings.xml
│ ├── Digital forensics.txt
│ └── NTFS.pptx
│ └── [Content_Types].xml
│ ├── [Content_Types].xml
│ ├── _rels
│ │ └── .rels
│ ├── docProps
│ │ ├── app.xml
│ │ ├── core.xml
│ │ └── thumbnail.jpeg
│ └── ppt
│ ├── _rels
│ │ └── presentation.xml.rels
│ ├── presProps.xml
│ ├── presentation.xml
│ ├── slideLayouts
│ │ ├── _rels
│ │ │ ├── slideLayout1.xml.rels
│ │ │ ├── slideLayout10.xml.rels
│ │ │ ├── slideLayout11.xml.rels
│ │ │ ├── slideLayout2.xml.rels
│ │ │ ├── slideLayout3.xml.rels
│ │ │ ├── slideLayout4.xml.rels
│ │ │ ├── slideLayout5.xml.rels
│ │ │ ├── slideLayout6.xml.rels
│ │ │ ├── slideLayout7.xml.rels
│ │ │ ├── slideLayout8.xml.rels
│ │ │ └── slideLayout9.xml.rels
│ │ ├── slideLayout1.xml
│ │ ├── slideLayout10.xml
│ │ ├── slideLayout11.xml
│ │ ├── slideLayout2.xml
│ │ ├── slideLayout3.xml
│ │ ├── slideLayout4.xml
│ │ ├── slideLayout5.xml
│ │ ├── slideLayout6.xml
│ │ ├── slideLayout7.xml
│ │ ├── slideLayout8.xml
│ │ └── slideLayout9.xml
│ ├── slideMasters
│ │ ├── _rels
│ │ │ └── slideMaster1.xml.rels
│ │ └── slideMaster1.xml
│ ├── slides
│ │ ├── _rels
│ │ │ ├── slide1.xml.rels
│ │ │ └── slide2.xml.rels
│ │ ├── slide1.xml
│ │ └── slide2.xml
│ ├── tableStyles.xml
│ ├── theme
│ │ └── theme1.xml
│ └── viewProps.xml
├── evidence.json
├── folder
│ ├── file.txt
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Expand Up @@ -5,9 +5,8 @@ go 1.16
require (
github.com/forensicanalysis/filetype v0.1.0
github.com/forensicanalysis/fscmd v0.2.0
github.com/forensicanalysis/fslib v0.15.0
github.com/forensicanalysis/fslib v0.15.1
github.com/forensicanalysis/goaff4 v0.3.0
github.com/forensicanalysis/zipfs v0.0.0-20210221135809-348f5c2dff80
github.com/nlepage/go-tarfs v1.0.4
github.com/spf13/cobra v1.1.3
)
10 changes: 4 additions & 6 deletions go.sum
View file
Expand Up @@ -44,17 +44,17 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU=
github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/forensicanalysis/filetype v0.1.0 h1:atOqOBAbA/SVyDQ1vmnbCGyO4R0uGgEZf6MFSvK6VCw=
github.com/forensicanalysis/filetype v0.1.0/go.mod h1:TvJVXsX+FtQmvj+7HnfgShad6A14DgiByy39V0dKeC4=
github.com/forensicanalysis/fscmd v0.2.0 h1:g0nbL2i3y82qKdFJrnY5y5nOGnvxWQqN/RD9I7+ZN8w=
github.com/forensicanalysis/fscmd v0.2.0/go.mod h1:vymoirTmQ9il20maL3olLXU+TJ4buy1SXTJfGOXJlG0=
github.com/forensicanalysis/fslib v0.15.0 h1:S0yvtljgeyZSbUYtZOb5nG6G+K29EUa4yfdcqTpiwsM=
github.com/forensicanalysis/fslib v0.15.0/go.mod h1:Ih/gIc8wQEOGCV6nEGOThSCA2yPCQ7y3McOIM6zoSYE=
github.com/forensicanalysis/fslib v0.15.1 h1:mB30Tn2xwW6+nvV6FLbKqz1BYtHJpt3j3oyHpXGrJCQ=
github.com/forensicanalysis/fslib v0.15.1/go.mod h1:cFsrRmnHRJkAE4Gbshk8N1myWx1BB7zT/u9+RnPH22M=
github.com/forensicanalysis/goaff4 v0.3.0 h1:/ri4UYi3FVgkUhu8ZLIFDW4Sh6oc1Kr8eEI0Xn9C9C4=
github.com/forensicanalysis/goaff4 v0.3.0/go.mod h1:f51BPxErhO0n8niAvsYjjSFIkYKsgGylXp+2nZeI9mQ=
github.com/forensicanalysis/zipfs v0.0.0-20210221135809-348f5c2dff80 h1:2Icn1rzDmbvjRQZUpfUn3f/M2ryqe0ksyyIRKz0kGOY=
github.com/forensicanalysis/zipfs v0.0.0-20210221135809-348f5c2dff80/go.mod h1:U0/cdLy2NjqS9wE2ndcQF2pQ2QIvv+egjz0YXnS/eLA=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
Expand Down Expand Up @@ -325,8 +325,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/djherbis/times.v1 v1.2.0 h1:UCvDKl1L/fmBygl2Y7hubXCnY7t4Yj46ZrBFNUipFbM=
gopkg.in/djherbis/times.v1 v1.2.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
Expand Down
9 changes: 7 additions & 2 deletions recursive.go
View file
Expand Up @@ -23,6 +23,7 @@
package recursivefs

import (
"archive/zip"
"errors"
"io"
"io/fs"
Expand All @@ -40,7 +41,6 @@ import (
"github.com/forensicanalysis/fslib/mbr"
"github.com/forensicanalysis/fslib/ntfs"
"github.com/forensicanalysis/goaff4"
"github.com/forensicanalysis/zipfs"
)

func parseRealPath(fsys fs.FS, sample string) (rpath []element, err error) {
Expand Down Expand Up @@ -95,7 +95,12 @@ func childFS(r io.Reader, name string) (fs.FS, error) { // nolint: gocyclo
var fsys fs.FS
switch t {
case filetype.Zip, filetype.Xlsx, filetype.Pptx, filetype.Docx:
fsys, err = zipfs.New(readSeekerAt)
var size int64
size, err = fsio.GetSize(readSeekerAt)
if err != nil {
return nil, err
}
fsys, err = zip.NewReader(readSeekerAt, size)
case filetype.Tar:
fsys, err = tarfs.New(readSeekerAt)
case filetype.FAT16:
Expand Down

0 comments on commit 0944d2a

Please sign in to comment.