Skip to content

Commit cd1d654

Browse files
Remove Compass resolver/permission map
1 parent 8e35f5e commit cd1d654

File tree

4 files changed

+4
-46
lines changed

4 files changed

+4
-46
lines changed

crates/forge_analyzer/src/checkers.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1119,10 +1119,7 @@ impl<'cx> Dataflow<'cx> for PermissionDataflow {
11191119
interp.bitbucket_permission_resolver,
11201120
interp.bitbucket_regex_map,
11211121
),
1122-
IntrinsicName::RequestCompass => {
1123-
(interp.compass_permission_resolver, interp.compass_regex_map)
1124-
}
1125-
IntrinsicName::Other => {
1122+
IntrinsicName::RequestCompass | IntrinsicName::Other => {
11261123
(&PermissionHashMap::new(), &HashMap::<String, Regex>::new())
11271124
}
11281125
};

crates/forge_analyzer/src/interp.rs

-6
Original file line numberDiff line numberDiff line change
@@ -396,14 +396,12 @@ pub struct Interp<'cx, C: Runner<'cx>> {
396396
pub jira_permission_resolver: &'cx PermissionHashMap,
397397
pub confluence_permission_resolver: &'cx PermissionHashMap,
398398
pub bitbucket_permission_resolver: &'cx PermissionHashMap,
399-
pub compass_permission_resolver: &'cx PermissionHashMap,
400399
pub jira_any_regex_map: &'cx HashMap<String, Regex>,
401400
pub jira_software_regex_map: &'cx HashMap<String, Regex>,
402401
pub jira_service_management_regex_map: &'cx HashMap<String, Regex>,
403402
pub jira_regex_map: &'cx HashMap<String, Regex>,
404403
pub confluence_regex_map: &'cx HashMap<String, Regex>,
405404
pub bitbucket_regex_map: &'cx HashMap<String, Regex>,
406-
pub compass_regex_map: &'cx HashMap<String, Regex>,
407405
_checker: PhantomData<C>,
408406
}
409407

@@ -528,8 +526,6 @@ impl<'cx, C: Runner<'cx>> Interp<'cx, C> {
528526
confluence_regex_map: &'cx HashMap<String, Regex>,
529527
bitbucket_permission_resolver: &'cx PermissionHashMap,
530528
bitbucket_regex_map: &'cx HashMap<String, Regex>,
531-
compass_permission_resolver: &'cx PermissionHashMap,
532-
compass_regex_map: &'cx HashMap<String, Regex>,
533529
) -> Self {
534530
let call_graph = CallGraph::new(env);
535531

@@ -562,14 +558,12 @@ impl<'cx, C: Runner<'cx>> Interp<'cx, C> {
562558
jira_permission_resolver,
563559
confluence_permission_resolver,
564560
bitbucket_permission_resolver,
565-
compass_permission_resolver,
566561
jira_any_regex_map,
567562
jira_software_regex_map,
568563
jira_service_management_regex_map,
569564
jira_regex_map,
570565
confluence_regex_map,
571566
bitbucket_regex_map,
572-
compass_regex_map,
573567
_checker: PhantomData,
574568
runner_visited: RefCell::new(FxHashSet::default()),
575569
}

crates/forge_permission_resolver/src/permissions_resolver.rs

-21
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@ pub fn get_permission_resolver_bitbucket() -> (PermissionHashMap, HashMap<String
142142
get_permission_resolver(bitbucket_url)
143143
}
144144

145-
pub fn get_permission_resolver_compass() -> (PermissionHashMap, HashMap<String, Regex>) {
146-
let compass_url = "https://developer.atlassian.com/cloud/compass/swagger.v3.json";
147-
get_permission_resolver(compass_url)
148-
}
149-
150145
pub fn get_permission_resolver(url: &str) -> (PermissionHashMap, HashMap<String, Regex>) {
151146
let mut endpoint_map: PermissionHashMap = HashMap::default();
152147
let mut endpoint_regex: HashMap<String, Regex> = HashMap::default();
@@ -413,22 +408,6 @@ mod test {
413408
);
414409
}
415410

416-
#[test]
417-
#[ignore]
418-
fn test_resolving_compass_permissions() {
419-
// TODO: it seems no permissions are being returned for compass urls
420-
let (permission_map, regex_map) = get_permission_resolver_compass();
421-
422-
let url = "/compass/v1/events";
423-
let request_type = RequestType::Post;
424-
let result = check_url_for_permissions(&permission_map, &regex_map, request_type, url);
425-
426-
assert!(
427-
!result.is_empty(),
428-
"Should have parsed permissions for compass endpoint"
429-
);
430-
}
431-
432411
#[test]
433412
fn test_get_issues_for_epic() {
434413
let (permission_map, regex_map) = get_permission_resolver_jira_software();

crates/fsrt/src/main.rs

+3-15
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ mod test;
66

77
use clap::{Parser, ValueHint};
88
use forge_permission_resolver::permissions_resolver::{
9-
get_permission_resolver_bitbucket, get_permission_resolver_compass,
10-
get_permission_resolver_confluence, get_permission_resolver_jira,
11-
get_permission_resolver_jira_any, get_permission_resolver_jira_service_management,
12-
get_permission_resolver_jira_software,
9+
get_permission_resolver_bitbucket, get_permission_resolver_confluence,
10+
get_permission_resolver_jira, get_permission_resolver_jira_any,
11+
get_permission_resolver_jira_service_management, get_permission_resolver_jira_software,
1312
};
1413
use glob::glob;
1514
use std::{
@@ -420,7 +419,6 @@ pub(crate) fn scan_directory<'a>(
420419
let (confluence_permission_resolver, confluence_regex_map) =
421420
get_permission_resolver_confluence();
422421
let (bitbucket_permission_resolver, bitbucket_regex_map) = get_permission_resolver_bitbucket();
423-
let (compass_permission_resolver, compass_regex_map) = get_permission_resolver_compass();
424422

425423
let mut definition_analysis_interp = Interp::<DefinitionAnalysisRunner>::new(
426424
&proj.env,
@@ -439,8 +437,6 @@ pub(crate) fn scan_directory<'a>(
439437
&confluence_regex_map,
440438
&bitbucket_permission_resolver,
441439
&bitbucket_regex_map,
442-
&compass_permission_resolver,
443-
&compass_regex_map,
444440
);
445441

446442
let mut interp = Interp::new(
@@ -460,8 +456,6 @@ pub(crate) fn scan_directory<'a>(
460456
&confluence_regex_map,
461457
&bitbucket_permission_resolver,
462458
&bitbucket_regex_map,
463-
&compass_permission_resolver,
464-
&compass_regex_map,
465459
);
466460
let mut authn_interp = Interp::new(
467461
&proj.env,
@@ -480,8 +474,6 @@ pub(crate) fn scan_directory<'a>(
480474
&confluence_regex_map,
481475
&bitbucket_permission_resolver,
482476
&bitbucket_regex_map,
483-
&compass_permission_resolver,
484-
&compass_regex_map,
485477
);
486478

487479
let mut reporter = Reporter::new();
@@ -502,8 +494,6 @@ pub(crate) fn scan_directory<'a>(
502494
&confluence_regex_map,
503495
&bitbucket_permission_resolver,
504496
&bitbucket_regex_map,
505-
&compass_permission_resolver,
506-
&compass_regex_map,
507497
);
508498
reporter.add_app(opts.appkey.clone().unwrap_or_default(), name.to_owned());
509499

@@ -524,8 +514,6 @@ pub(crate) fn scan_directory<'a>(
524514
&confluence_regex_map,
525515
&bitbucket_permission_resolver,
526516
&bitbucket_regex_map,
527-
&compass_permission_resolver,
528-
&compass_regex_map,
529517
);
530518
for func in &proj.funcs {
531519
let mut def_checker = DefinitionAnalysisRunner::new();

0 commit comments

Comments
 (0)