Skip to content

Revert "add hardcoded evidence keys to evidence_key_filter" #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 8, 2025
Merged

Revert "add hardcoded evidence keys to evidence_key_filter" #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c89f2
Revert "feat(4.5): add hardcoded evidence keys to `evidence_key_filter`"
drasmart Feb 7, 2025
1240294
Fix styling/remove redundant whitespaces
BohdanVV Feb 7, 2025
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
10 changes: 0 additions & 10 deletions fiftyone_devicedetection_onpremise/src/fiftyone_devicedetection_onpremise/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,3 @@
'find a match. This is the number of nodes in the '
'graph which have been visited.')
METHOD_DESCRIPTION = 'The method used to determine the match result.'
HARDCODED_EVIDENCE = {
"GHEV": {
"COOKIE": "cookie.51d_gethighentropyvalues",
"QUERY": "query.51d_gethighentropyvalues",
},
"SUA": {
"COOKIE": "cookie.51d_structureduseragent",
"QUERY": "query.51d_structureduseragent",
},
}
7 changes: 0 additions & 7 deletions ...cedetection_onpremise/src/fiftyone_devicedetection_onpremise/devicedetection_onpremise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,6 @@ def init_engine(self):
for x in range(evidence_keys.size()):
evidence_keys_list.append(evidence_keys.__getitem__(x).lower())

evidence_keys_list.extend([
HARDCODED_EVIDENCE["GHEV"]["COOKIE"],
HARDCODED_EVIDENCE["GHEV"]["QUERY"],
HARDCODED_EVIDENCE["SUA"]["COOKIE"],
HARDCODED_EVIDENCE["SUA"]["QUERY"],
])

self.evidence_keys_list = evidence_keys_list

# Get properties list
Expand Down
35 changes: 0 additions & 35 deletions fiftyone_devicedetection_onpremise/tests/test_devicedetection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import csv
import platform

from fiftyone_devicedetection_onpremise.constants import HARDCODED_EVIDENCE

from fiftyone_devicedetection_onpremise.devicedetection_onpremise_pipelinebuilder import DeviceDetectionOnPremisePipelineBuilder

from fiftyone_devicedetection_onpremise.devicedetection_onpremise import DeviceDetectionOnPremise
Expand Down Expand Up @@ -360,39 +358,6 @@ def test_evidencekey_filter_overrides(self):
self.assertTrue(evidence_key_filter.filter_evidence_key(
"cookie.51d_profileids"))

def test_evidencekey_filter_hardcoded_keys(self):
"""!
Test evidence key filter with hardcoded keys in cookies and query string
"""

pipeline = DeviceDetectionOnPremisePipelineBuilder(
data_file_path=data_file, usage_sharing=False, licence_keys="").build()

evidence_key_filter = pipeline.flow_elements[0].get_evidence_key_filter(
)
self.assertTrue(evidence_key_filter.filter_evidence_key(
HARDCODED_EVIDENCE["GHEV"]["QUERY"]))
self.assertTrue(evidence_key_filter.filter_evidence_key(
HARDCODED_EVIDENCE["GHEV"]["COOKIE"]))
self.assertTrue(evidence_key_filter.filter_evidence_key(
HARDCODED_EVIDENCE["SUA"]["QUERY"]))
self.assertTrue(evidence_key_filter.filter_evidence_key(
HARDCODED_EVIDENCE["SUA"]["COOKIE"]))

self.assertTrue(evidence_key_filter.filter_evidence_key(
"query.51d_gethighentropyvalues"))
self.assertTrue(evidence_key_filter.filter_evidence_key(
"cookie.51d_gethighentropyvalues"))
self.assertTrue(evidence_key_filter.filter_evidence_key(
"query.51d_structureduseragent"))
self.assertTrue(evidence_key_filter.filter_evidence_key(
"cookie.51d_structureduseragent"))

self.assertTrue(evidence_key_filter.filter_evidence_key(
"header.user-agent"))
self.assertFalse(evidence_key_filter.filter_evidence_key(
"header.nonexistent"))

def test_profile_overrides(self):
"""!
Test profile overrides
Expand Down
Loading