Change tappx full dinamic endpoint to a parcial dinamic endpoint

.github/workflows/cross-repo-issue.yml

@@ -0,0 +1,28 @@
+name: Cross-repo Issue Creation
+
+on:
+  pull_request_target:
+    types: [closed]
+    branches:
+      - "master"
+
+jobs:
+  cross-repo:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.XREPO_APP_ID }}
+          private_key: ${{ secrets.XREPO_PEM }}
+      - name: create issue in other repo
+        if: "!contains(github.event.pull_request.labels.*.name, 'do not port') && github.event.pull_request.merged"
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          echo -e "A PR was merged over on PBS-Go\n\n- [https://github.com/prebid/prebid-server/pull/${{github.event.number}}](https://github.com/prebid/prebid-server/pull/${{github.event.number}})\n- timestamp: ${{ github.event.pull_request.merged_at}}" > msg
+          export msg=$(cat msg)
+          gh issue create --repo prebid/prebid-server-java --title "Port PR from PBS-Go: ${{ github.event.pull_request.title }}" \
+              --body "$msg" \
+              --label auto

.github/workflows/issue_prioritization.yml

@@ -25,21 +25,30 @@ jobs:
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
-                projectNext(number: $number) {
+                projectV2(number: $number) {
                   id
                   fields(first:100) {
                     nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2Field {
+                        id
+                        name
+                      }
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                     }
                   }
                 }
               }
             }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'DATE_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "'"$DATE_FIELD"'") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'DATE_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name=="'"$DATE_FIELD"'") | .id' project_data.json) >> $GITHUB_ENV
 
       - name: Add issue to project
         env:
@@ -48,9 +57,9 @@ jobs:
         run: |
           gh api graphql -f query='
             mutation($project:ID!, $issue:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
-                projectNextItem {
-                  id,
+              addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
+                item {
+                  id
                   content {
                      ... on Issue {
                         createdAt
@@ -63,8 +72,8 @@ jobs:
               }
             }' -f project=$PROJECT_ID -f issue=$ISSUE_ID > issue_data.json
 
-          echo 'ITEM_ID='$(jq '.data.addProjectNextItem.projectNextItem.id' issue_data.json) >> $GITHUB_ENV
-          echo 'ITEM_CREATION_DATE='$(jq '.data.addProjectNextItem.projectNextItem.content.createdAt' issue_data.json) >> $GITHUB_ENV
+          echo 'ITEM_ID='$(jq '.data.addProjectV2ItemById.item.id' issue_data.json) >> $GITHUB_ENV
+          echo 'ITEM_CREATION_DATE='$(jq '.data.addProjectV2ItemById.item.content.createdAt' issue_data.json | cut -c 2-11) >> $GITHUB_ENV
 
       - name: Set fields
         env:
@@ -75,15 +84,17 @@ jobs:
               $project: ID!
               $item: ID!
               $date_field: ID!
-              $date_value: String!
+              $date_value: Date!
             ) {
-              set_creation_date: updateProjectNextItemField(input: {
+              set_creation_date: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $date_field
-                value: $date_value
+                value: {
+                  date: $date_value
+                }
               }) {
-                projectNextItem {
+                projectV2Item {
                   id
                 }
               }

.github/workflows/release.yml

@@ -14,8 +14,8 @@ jobs:
       - name: Get Version
         id: get_version
         run: |
-          echo ::set-output name=tag::${GITHUB_REF/refs\/tags\/}
-          echo ::set-output name=version::${GITHUB_REF/refs\/tags\/v}
+          echo "tag=${GITHUB_REF/refs\/tags\/}" >> $GITHUB_OUTPUT
+          echo "version=${GITHUB_REF/refs\/tags\/v}" >> $GITHUB_OUTPUT
 
       - name: Create & Publish Release
         uses: release-drafter/release-drafter@v5.12.1

.github/workflows/security.yml

@@ -5,6 +5,8 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+    paths:
+      - go.mod
 
 jobs:
   build:

Makefile

@@ -1,8 +1,8 @@
 # Makefile
 
-all: deps test build
+all: deps test build-modules build
 
-.PHONY: deps test build image
+.PHONY: deps test build-modules build image
 
 # deps will clean out the vendor directory and use go mod for a fresh install
 deps:
@@ -18,6 +18,10 @@ else
 	go test github.com/prebid/prebid-server/adapters/$(adapter) -bench=.
 endif
 
+# build-modules generates modules/builder.go file which provides a list of all available modules
+build-modules:
+	go generate modules/modules.go
+
 # build will ensure all of our tests pass and then build the go binary
 build: test
 	go build -mod=vendor ./...

README.md

@@ -1,4 +1,4 @@
-[![Build](https://img.shields.io/github/workflow/status/prebid/prebid-server/Validate/master?style=flat-square)](https://github.com/prebid/prebid-server/actions/workflows/validate.yml)
+[![Build](https://img.shields.io/github/actions/workflow/status/prebid/prebid-server/validate.yml?branch=master&style=flat-square)](https://github.com/prebid/prebid-server/actions/workflows/validate.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/prebid/prebid-server?style=flat-square)](https://goreportcard.com/report/github.com/prebid/prebid-server)
 ![Go Version](https://img.shields.io/github/go-mod/go-version/prebid/prebid-server?style=flat-square)
 

account/account.go

@@ -16,7 +16,7 @@ import (
 )
 
 // GetAccount looks up the config.Account object referenced by the given accountID, with access rules applied
-func GetAccount(ctx context.Context, cfg *config.Configuration, fetcher stored_requests.AccountFetcher, accountID string) (account *config.Account, errs []error) {
+func GetAccount(ctx context.Context, cfg *config.Configuration, fetcher stored_requests.AccountFetcher, accountID string, me metrics.MetricsEngine) (account *config.Account, errs []error) {
 	// Check BlacklistedAcctMap until we have deprecated it
 	if _, found := cfg.BlacklistedAcctMap[accountID]; found {
 		return nil, []error{&errortypes.BlacklistedAcct{
@@ -28,7 +28,7 @@ func GetAccount(ctx context.Context, cfg *config.Configuration, fetcher stored_r
 			Message: fmt.Sprintf("Prebid-server has been configured to discard requests without a valid Account ID. Please reach out to the prebid server host."),
 		}}
 	}
-	if accountJSON, accErrs := fetcher.FetchAccount(ctx, accountID); len(accErrs) > 0 || accountJSON == nil {
+	if accountJSON, accErrs := fetcher.FetchAccount(ctx, cfg.AccountDefaultsJSON(), accountID); len(accErrs) > 0 || accountJSON == nil {
 		// accountID does not reference a valid account
 		for _, e := range accErrs {
 			if _, ok := e.(stored_requests.NotFoundError); !ok {
@@ -49,27 +49,40 @@ func GetAccount(ctx context.Context, cfg *config.Configuration, fetcher stored_r
 	} else {
 		// accountID resolved to a valid account, merge with AccountDefaults for a complete config
 		account = &config.Account{}
-		completeJSON, err := jsonpatch.MergePatch(cfg.AccountDefaultsJSON(), accountJSON)
-		if err == nil {
-			err = json.Unmarshal(completeJSON, account)
+		err := json.Unmarshal(accountJSON, account)
+
+		// this logic exists for backwards compatibility. If the initial unmarshal fails above, we attempt to
+		// resolve it by converting the GDPR enforce purpose fields and then attempting an unmarshal again before
+		// declaring a malformed account error.
+		// unmarshal fetched account to determine if it is well-formed
+		var deprecatedPurposeFields []string
+		if _, ok := err.(*json.UnmarshalTypeError); ok {
+			// attempt to convert deprecated GDPR enforce purpose fields to resolve issue
+			accountJSON, err, deprecatedPurposeFields = ConvertGDPREnforcePurposeFields(accountJSON)
+			// unmarshal again to check if unmarshal error still exists after GDPR field conversion
+			err = json.Unmarshal(accountJSON, account)
 
-			// this logic exists for backwards compatibility. If the initial unmarshal fails above, we attempt to
-			// resolve it by converting the GDPR enforce purpose fields and then attempting an unmarshal again before
-			// declaring a malformed account error.
-			// unmarshal fetched account to determine if it is well-formed
 			if _, ok := err.(*json.UnmarshalTypeError); ok {
-				// attempt to convert deprecated GDPR enforce purpose fields to resolve issue
-				completeJSON, err = ConvertGDPREnforcePurposeFields(completeJSON)
-				// unmarshal again to check if unmarshal error still exists after GDPR field conversion
-				err = json.Unmarshal(completeJSON, account)
-
-				if _, ok := err.(*json.UnmarshalTypeError); ok {
-					return nil, []error{&errortypes.MalformedAcct{
-						Message: fmt.Sprintf("The prebid-server account config for account id \"%s\" is malformed. Please reach out to the prebid server host.", accountID),
-					}}
-				}
+				return nil, []error{&errortypes.MalformedAcct{
+					Message: fmt.Sprintf("The prebid-server account config for account id \"%s\" is malformed. Please reach out to the prebid server host.", accountID),
+				}}
 			}
 		}
+		usingGDPRChannelEnabled := useGDPRChannelEnabled(account)
+		usingCCPAChannelEnabled := useCCPAChannelEnabled(account)
+
+		if usingGDPRChannelEnabled {
+			me.RecordAccountGDPRChannelEnabledWarning(accountID)
+		}
+		if usingCCPAChannelEnabled {
+			me.RecordAccountCCPAChannelEnabledWarning(accountID)
+		}
+		for _, purposeName := range deprecatedPurposeFields {
+			me.RecordAccountGDPRPurposeWarning(accountID, purposeName)
+		}
+		if len(deprecatedPurposeFields) > 0 || usingGDPRChannelEnabled || usingCCPAChannelEnabled {
+			me.RecordAccountUpgradeStatus(accountID)
+		}
 
 		if err != nil {
 			errs = append(errs, err)
@@ -92,6 +105,13 @@ func GetAccount(ctx context.Context, cfg *config.Configuration, fetcher stored_r
 	return account, nil
 }
 
+// TCF2Enforcements maps enforcement algo string values to their integer representation and is
+// used to limit string compares
+var TCF2Enforcements = map[string]config.TCF2EnforcementAlgo{
+	config.TCF2EnforceAlgoBasic: config.TCF2BasicEnforcement,
+	config.TCF2EnforceAlgoFull:  config.TCF2FullEnforcement,
+}
+
 // setDerivedConfig modifies an account object by setting fields derived from other fields set in the account configuration
 func setDerivedConfig(account *config.Account) {
 	account.GDPR.PurposeConfigs = map[consentconstants.Purpose]*config.AccountGDPRPurpose{
@@ -107,9 +127,16 @@ func setDerivedConfig(account *config.Account) {
 		10: &account.GDPR.Purpose10,
 	}
 
-	// To look for a purpose's vendor exceptions in O(1) time, for each purpose we fill this hash table with bidders
-	// located in the VendorExceptions field of the GDPR.PurposeX struct
 	for _, pc := range account.GDPR.PurposeConfigs {
+		// To minimize the number of string compares per request, we set the integer representation
+		// of the enforcement algorithm on each purpose config
+		pc.EnforceAlgoID = config.TCF2UndefinedEnforcement
+		if algo, exists := TCF2Enforcements[pc.EnforceAlgo]; exists {
+			pc.EnforceAlgoID = algo
+		}
+
+		// To look for a purpose's vendor exceptions in O(1) time, for each purpose we fill this hash table with bidders
+		// located in the VendorExceptions field of the GDPR.PurposeX struct
 		if pc.VendorExceptions == nil {
 			continue
 		}
@@ -157,13 +184,13 @@ type PatchAccountGDPRPurpose struct {
 // given the recent type change of gdpr.purpose{1-10}.enforce_purpose from a string to a bool. This function
 // iterates over each GDPR purpose config and sets enforce_purpose and enforce_algo to the appropriate
 // bool and string values respectively if enforce_purpose is a string and enforce_algo is not set
-func ConvertGDPREnforcePurposeFields(config []byte) (newConfig []byte, err error) {
+func ConvertGDPREnforcePurposeFields(config []byte) (newConfig []byte, err error, deprecatedPurposeFields []string) {
 	gdprJSON, _, _, err := jsonparser.Get(config, "gdpr")
 	if err != nil && err == jsonparser.KeyPathNotFoundError {
-		return config, nil
+		return config, nil, deprecatedPurposeFields
 	}
 	if err != nil {
-		return nil, err
+		return nil, err, deprecatedPurposeFields
 	}
 
 	newAccount := PatchAccount{
@@ -178,15 +205,17 @@ func ConvertGDPREnforcePurposeFields(config []byte) (newConfig []byte, err error
 			continue
 		}
 		if err != nil {
-			return nil, err
+			return nil, err, deprecatedPurposeFields
 		}
 		if purposeDataType != jsonparser.String {
 			continue
+		} else {
+			deprecatedPurposeFields = append(deprecatedPurposeFields, purposeName)
 		}
 
 		_, _, _, err = jsonparser.Get(gdprJSON, purposeName, "enforce_algo")
 		if err != nil && err != jsonparser.KeyPathNotFoundError {
-			return nil, err
+			return nil, err, deprecatedPurposeFields
 		}
 		if err == nil {
 			continue
@@ -205,13 +234,21 @@ func ConvertGDPREnforcePurposeFields(config []byte) (newConfig []byte, err error
 
 	patchConfig, err := json.Marshal(newAccount)
 	if err != nil {
-		return nil, err
+		return nil, err, deprecatedPurposeFields
 	}
 
 	newConfig, err = jsonpatch.MergePatch(config, patchConfig)
 	if err != nil {
-		return nil, err
+		return nil, err, deprecatedPurposeFields
 	}
 
-	return newConfig, nil
+	return newConfig, nil, deprecatedPurposeFields
+}
+
+func useGDPRChannelEnabled(account *config.Account) bool {
+	return account.GDPR.ChannelEnabled.IsSet() && !account.GDPR.IntegrationEnabled.IsSet()
+}
+
+func useCCPAChannelEnabled(account *config.Account) bool {
+	return account.CCPA.ChannelEnabled.IsSet() && !account.CCPA.IntegrationEnabled.IsSet()
 }