Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/contributing/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ All vulnerability data is stored in [Cloud Datastore], with the [models] defined

[Cloud Datastore]: https://cloud.google.com/datastore
[models]: https://googleapis.dev/python/python-ndb/latest/index.html#defining-entities-keys-and-properties
[here]: https://github.com/google/osv/blob/master/osv/models.py
[here]: https://github.com/google/osv.dev/blob/master/osv/models.py

## Google Kubernetes Engine (GKE)

Expand All @@ -35,15 +35,15 @@ Workers are Docker containers, which use [gVisor] for sandboxing untrusted
workloads.

[GKE]: https://cloud.google.com/kubernetes-engine
[workers]: https://github.com/google/osv/tree/master/gcp/workers
[workers]: https://github.com/google/osv.dev/tree/master/gcp/workers
[gVisor]: https://gvisor.dev/
[Cloud Pub/Sub]: https://cloud.google.com/pubsub

## Cloud Run / Cloud Endpoints

The [API server] runs on [Cloud Run], and is served by [Cloud Endpoints].

[API server]: https://github.com/google/osv/tree/master/gcp/api
[API server]: https://github.com/google/osv.dev/tree/master/gcp/api
[Cloud Run]: https://cloud.google.com/run
[Cloud Endpoints]: https://cloud.google.com/endpoints

Expand Down
2 changes: 1 addition & 1 deletion gcp/website/frontend3/src/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ <h2 class="heading">GitHub Workflows</h2>
<h2 class="heading">Open source</h2>
<p class="description"> This project is <a href="https://github.com/google/osv">open source</a>. If you
have any ideas or questions, please feel free to reach out by <a
href="https://github.com/google/osv/issues/new/choose">creating an issue</a>! </p>
href="https://github.com/google/osv.dev/issues/new/choose">creating an issue</a>! </p>

<div class="cta">
<a class="cta-primary link-button" href="https://google.github.io/osv.dev/faq/"
Expand Down
12 changes: 6 additions & 6 deletions vulnfeeds/cmd/combine-to-osv/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"time"

"cloud.google.com/go/storage"
"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/gcs-tools"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/gcs-tools"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
10 changes: 5 additions & 5 deletions vulnfeeds/cmd/converters/alpine/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"strings"
"time"

"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/types/known/timestamppb"
)
Expand Down
2 changes: 1 addition & 1 deletion vulnfeeds/cmd/converters/alpine/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/models"
)

func TestCpeMatchesAlpinePackage(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions vulnfeeds/cmd/converters/cve/cve5/bulk-converter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"sync/atomic"
"time"

"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/conversion/cve5"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/gcs-tools"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/conversion/cve5"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/gcs-tools"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
)

const defaultStartYear = "2022"
Expand Down
8 changes: 4 additions & 4 deletions vulnfeeds/cmd/converters/cve/cve5/single-converter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"log/slog"
"os"

"github.com/google/osv/vulnfeeds/conversion/cve5"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/conversion/cve5"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
)

var (
Expand Down
16 changes: 8 additions & 8 deletions vulnfeeds/cmd/converters/cve/nvd-cve-osv/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import (
"sync"
"sync/atomic"

c "github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/conversion/nvd"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/gcs-tools"
"github.com/google/osv/vulnfeeds/git"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
c "github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/conversion/nvd"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/gcs-tools"
"github.com/google/osv.dev/vulnfeeds/git"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
)

var (
Expand Down
12 changes: 6 additions & 6 deletions vulnfeeds/cmd/converters/debian/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"strings"

"cloud.google.com/go/storage"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/faulttolerant"
gcs "github.com/google/osv/vulnfeeds/gcs-tools"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/faulttolerant"
gcs "github.com/google/osv.dev/vulnfeeds/gcs-tools"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/types/known/timestamppb"
)
Expand Down
4 changes: 2 additions & 2 deletions vulnfeeds/cmd/converters/debian/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/google/go-cmp/cmp"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/testing/protocmp"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
4 changes: 2 additions & 2 deletions vulnfeeds/cmd/converters/dsa-dla-dtsa/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"time"

htmltomarkdown "github.com/JohannesKaufmann/html-to-markdown/v2"
"github.com/google/osv/vulnfeeds/conversion/writer"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/conversion/writer"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"golang.org/x/text/encoding/charmap"
"google.golang.org/protobuf/encoding/protojson"
Expand Down
4 changes: 2 additions & 2 deletions vulnfeeds/cmd/ids/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"time"

"github.com/goccy/go-yaml"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/encoding/protojson"
)
Expand Down
8 changes: 4 additions & 4 deletions vulnfeeds/cmd/mirrors/cpe-repo-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ import (
"strings"
"text/template"

c "github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/git"
"github.com/google/osv/vulnfeeds/utility"
"github.com/google/osv/vulnfeeds/utility/logger"
c "github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/git"
"github.com/google/osv.dev/vulnfeeds/utility"
"github.com/google/osv.dev/vulnfeeds/utility/logger"

"slices"
)
Expand Down
6 changes: 3 additions & 3 deletions vulnfeeds/cmd/mirrors/download-cves/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"time"

"cloud.google.com/go/storage"
"github.com/google/osv/vulnfeeds/gcs-tools"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/gcs-tools"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/sethvargo/go-retry"
"golang.org/x/sync/errgroup"
)
Expand Down
12 changes: 6 additions & 6 deletions vulnfeeds/cmd/pypi/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"path/filepath"
"strings"

"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/pypi"
"github.com/google/osv/vulnfeeds/triage"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/pypi"
"github.com/google/osv.dev/vulnfeeds/triage"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion vulnfeeds/cmd/pypi/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"path/filepath"
"testing"

"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/ossf/osv-schema/bindings/go/osvschema"
)

Expand Down
10 changes: 5 additions & 5 deletions vulnfeeds/conversion/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"strings"
"time"

"github.com/google/osv/vulnfeeds/git"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/git"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/types/known/structpb"
)
Expand Down
2 changes: 1 addition & 1 deletion vulnfeeds/conversion/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/testing/protocmp"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
6 changes: 3 additions & 3 deletions vulnfeeds/conversion/cve5/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

c "github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
c "github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
)

Expand Down
6 changes: 3 additions & 3 deletions vulnfeeds/conversion/cve5/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/testing/protocmp"
)
Expand Down
10 changes: 5 additions & 5 deletions vulnfeeds/conversion/cve5/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"sort"
"time"

"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvconstants"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down
4 changes: 2 additions & 2 deletions vulnfeeds/conversion/cve5/converter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/gkampitakis/go-snaps/snaps"
"github.com/google/go-cmp/cmp"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvconstants"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/testing/protocmp"
Expand Down
10 changes: 5 additions & 5 deletions vulnfeeds/conversion/cve5/default_extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"slices"
"strings"

c "github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/git"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
c "github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/git"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
)

Expand Down
4 changes: 2 additions & 2 deletions vulnfeeds/conversion/cve5/extraction.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cve5

import (
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
)

// VersionExtractor defines the interface for different version extraction strategies.
Expand Down
8 changes: 4 additions & 4 deletions vulnfeeds/conversion/cve5/linux_extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"strconv"
"strings"

c "github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/utility/logger"
"github.com/google/osv/vulnfeeds/vulns"
c "github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/utility/logger"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvconstants"
"github.com/ossf/osv-schema/bindings/go/osvschema"
)
Expand Down
6 changes: 3 additions & 3 deletions vulnfeeds/conversion/cve5/strategies.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cve5

import (
c "github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
c "github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
)

Expand Down
6 changes: 3 additions & 3 deletions vulnfeeds/conversion/cve5/version_extraction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/osv/vulnfeeds/conversion"
"github.com/google/osv/vulnfeeds/models"
"github.com/google/osv/vulnfeeds/vulns"
"github.com/google/osv.dev/vulnfeeds/conversion"
"github.com/google/osv.dev/vulnfeeds/models"
"github.com/google/osv.dev/vulnfeeds/vulns"
"github.com/ossf/osv-schema/bindings/go/osvschema"
"google.golang.org/protobuf/testing/protocmp"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
Loading
Loading