Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

Commit bebdf26

Browse files
RazicanRazican
committed
Changed to super-analyzer (binary name still super)
1 parent 4bf137b commit bebdf26

File tree

5 files changed

+71
-68
lines changed

5 files changed

+71
-68
lines changed

‎Cargo.toml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -77,50 +77,50 @@ assets = [
7777
["target/release/super.fish", "usr/share/fish/vendor_completions.d/", "755"],
7878
["target/release/_super", "usr/share/zsh/vendor-completions/", "755"],
7979
# JD-CMD
80-
["vendor/jd-cmd.jar", "usr/share/super/vendor/", "755"],
81-
["vendor/jd-cmd.LICENSE.txt", "usr/share/super/vendor/", "644"],
80+
["vendor/jd-cmd.jar", "usr/share/super-analyzer/vendor/", "755"],
81+
["vendor/jd-cmd.LICENSE.txt", "usr/share/super-analyzer/vendor/", "644"],
8282
# Dex2Jar
83-
["vendor/dex2jar-2.1-SNAPSHOT/LICENSE.txt", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/", "644"],
84-
["vendor/dex2jar-2.1-SNAPSHOT/NOTICE.txt", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/", "644"],
85-
["vendor/dex2jar-2.1-SNAPSHOT/d2j-dex2jar.sh", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/", "755"],
86-
["vendor/dex2jar-2.1-SNAPSHOT/d2j_invoke.sh", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/", "755"],
87-
["vendor/dex2jar-2.1-SNAPSHOT/lib/antlr-runtime-3.5.2.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
88-
["vendor/dex2jar-2.1-SNAPSHOT/lib/asm-debug-all-4.1.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
89-
["vendor/dex2jar-2.1-SNAPSHOT/lib/d2j-base-cmd-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
90-
["vendor/dex2jar-2.1-SNAPSHOT/lib/d2j-jasmin-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
91-
["vendor/dex2jar-2.1-SNAPSHOT/lib/d2j-smali-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
92-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-ir-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
93-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-reader-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
94-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-reader-api-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
95-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-tools-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
96-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-translator-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
97-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-writer-2.1-SNAPSHOT.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
98-
["vendor/dex2jar-2.1-SNAPSHOT/lib/dx-1.7.jar", "usr/share/super/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
83+
["vendor/dex2jar-2.1-SNAPSHOT/LICENSE.txt", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/", "644"],
84+
["vendor/dex2jar-2.1-SNAPSHOT/NOTICE.txt", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/", "644"],
85+
["vendor/dex2jar-2.1-SNAPSHOT/d2j-dex2jar.sh", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/", "755"],
86+
["vendor/dex2jar-2.1-SNAPSHOT/d2j_invoke.sh", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/", "755"],
87+
["vendor/dex2jar-2.1-SNAPSHOT/lib/antlr-runtime-3.5.2.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
88+
["vendor/dex2jar-2.1-SNAPSHOT/lib/asm-debug-all-4.1.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
89+
["vendor/dex2jar-2.1-SNAPSHOT/lib/d2j-base-cmd-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
90+
["vendor/dex2jar-2.1-SNAPSHOT/lib/d2j-jasmin-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
91+
["vendor/dex2jar-2.1-SNAPSHOT/lib/d2j-smali-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
92+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-ir-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
93+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-reader-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
94+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-reader-api-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
95+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-tools-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
96+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-translator-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
97+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dex-writer-2.1-SNAPSHOT.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
98+
["vendor/dex2jar-2.1-SNAPSHOT/lib/dx-1.7.jar", "usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT/lib/", "755"],
9999
#CSS
100-
["templates/super/css/androidstudio.css", "usr/share/super/templates/super/css/", "644"],
101-
["templates/super/css/style.css", "usr/share/super/templates/super/css/", "644"],
100+
["templates/super-analyzer/css/androidstudio.css", "usr/share/super-analyzer/templates/super-analyzer/css/", "644"],
101+
["templates/super-analyzer/css/style.css", "usr/share/super-analyzer/templates/super-analyzer/css/", "644"],
102102
# Images
103-
["templates/super/img/folder-icon.png", "usr/share/super/templates/super/img/", "644"],
104-
["templates/super/img/java-icon.png", "usr/share/super/templates/super/img/", "644"],
105-
["templates/super/img/xml-icon.png", "usr/share/super/templates/super/img/", "644"],
106-
["templates/super/img/report.png", "usr/share/super/vendor/results_template/img/", "644"],
107-
["templates/super/img/logo.png", "usr/share/super/templates/super/img/", "644"],
103+
["templates/super-analyzer/img/folder-icon.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"],
104+
["templates/super-analyzer/img/java-icon.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"],
105+
["templates/super-analyzer/img/xml-icon.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"],
106+
["templates/super-analyzer/img/report.png", "usr/share/super-analyzer/vendor/results_template/img/", "644"],
107+
["templates/super-analyzer/img/logo.png", "usr/share/super-analyzer/templates/super-analyzer/img/", "644"],
108108
# JavaScript
109-
["templates/super/js/highlight.js.LICENSE", "usr/share/super/templates/super/js/", "644"],
110-
["templates/super/js/highlight.pack.js", "usr/share/super/templates/super/js/", "644"],
111-
["templates/super/js/jquery-3.2.0.slim.min.js", "usr/share/super/templates/super/js/", "644"],
112-
["templates/super/js/src_nav.js", "usr/share/super/templates/super/js/", "644"],
109+
["templates/super-analyzer/js/highlight.js.LICENSE", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"],
110+
["templates/super-analyzer/js/highlight.pack.js", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"],
111+
["templates/super-analyzer/js/jquery-3.2.0.slim.min.js", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"],
112+
["templates/super-analyzer/js/src_nav.js", "usr/share/super-analyzer/templates/super-analyzer/js/", "644"],
113113
# templates
114-
["templates/super/code.hbs", "usr/share/super/templates/super/", "644"],
115-
["templates/super/report.hbs", "usr/share/super/templates/super/", "644"],
116-
["templates/super/src.hbs", "usr/share/super/templates/super/", "644"],
117-
["templates/super/vulnerability.hbs", "usr/share/super/templates/super/", "644"],
114+
["templates/super-analyzer/code.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"],
115+
["templates/super-analyzer/report.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"],
116+
["templates/super-analyzer/src.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"],
117+
["templates/super-analyzer/vulnerability.hbs", "usr/share/super-analyzer/templates/super-analyzer/", "644"],
118118
# Config
119-
["rules.json", "etc/super/", "644"],
120-
["config.toml", "etc/super/", "644"],
121-
["config.toml.sample", "etc/super/", "644"],
119+
["rules.json", "etc/super-analyzer/", "644"],
120+
["config.toml", "etc/super-analyzer/", "644"],
121+
["config.toml.sample", "etc/super-analyzer/", "644"],
122122
# README
123-
["README.md", "usr/share/doc/super/README.md", "644"],
123+
["README.md", "usr/share/doc/super-analyzer/README.md", "644"],
124124
]
125125

126126
# The release profile, used for `cargo build`.

‎config.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
# results_folder = "results"
1515

1616
# Dex2Jar folder
17-
# dex2jar_folder = "/usr/share/super/vendor/dex2jar-2.1-SNAPSHOT"
17+
# dex2jar_folder = "/usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT"
1818

1919
# JD-cmd JAR file
20-
# jd_cmd_file = "/usr/share/super/vendor/jd-cmd.jar"
20+
# jd_cmd_file = "/usr/share/super-analyzer/vendor/jd-cmd.jar"
2121

2222
# Templates folder
23-
# templates_folder = "/usr/share/super/templates"
23+
# templates_folder = "/usr/share/super-analyzer/templates"
2424

2525
# Results template used
2626
# template = "super"
2727

2828
# Vulnerability rules JSON
29-
# rules_json = "/etc/super/rules.json"
29+
# rules_json = "/etc/super-analyzer/rules.json"
3030

3131
# Generates HTML report
3232
# html_report = true

‎config.toml.sample‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ threads = 2 # Number of threads for the application
22
downloads_folder = "downloads" # Folder for APK files
33
dist_folder = "dist" # Folder where the source code will be extracted
44
results_folder = "results" # Folder where results will be generated
5-
dex2jar_folder = "/usr/share/super/vendor/dex2jar-2.1-SNAPSHOT" # Dex2Jar folder
6-
jd_cmd_file = "/usr/share/super/vendor/jd-cmd.jar" # JD-cmd JAR file
7-
templates_folder = "/usr/share/super/templates"
5+
dex2jar_folder = "/usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT" # Dex2Jar folder
6+
jd_cmd_file = "/usr/share/super-analyzer/vendor/jd-cmd.jar" # JD-cmd JAR file
7+
templates_folder = "/usr/share/super-analyzer/templates"
88
template = "super" # Results template
9-
rules_json = "/etc/super/rules.json" # Vulnerability rules JSON
9+
rules_json = "/etc/super-analyzer/rules.json" # Vulnerability rules JSON
1010

1111
# Vulnerable or potentially vulnerable permissions
1212
[[permissions]]

‎rpmbuild/super.spec‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Secure, Unified, Powerful and Extensible Rust Android Analyzer.
1414
%prep
1515
%autosetup
1616
/usr/bin/curl https://sh.rustup.rs -sSf | sh -s -- -y
17+
~/.cargo/bin/rustup update
1718

1819
%build
1920
~/.cargo/bin/cargo build --release
@@ -23,24 +24,24 @@ mkdir -p %{buildroot}%{_bindir}
2324
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
2425
mkdir -p %{buildroot}%{_datadir}/fish/vendor_completions.d
2526
mkdir -p %{buildroot}%{_datadir}/zsh/site-functions
26-
mkdir -p %{buildroot}%{_datadir}/%{name}/templates/%{name}/css
27-
mkdir -p %{buildroot}%{_datadir}/%{name}/templates/%{name}/img
28-
mkdir -p %{buildroot}%{_datadir}/%{name}/templates/%{name}/js
27+
mkdir -p %{buildroot}%{_datadir}/%{name}/templates/super/css
28+
mkdir -p %{buildroot}%{_datadir}/%{name}/templates/super/img
29+
mkdir -p %{buildroot}%{_datadir}/%{name}/templates/super/js
2930
mkdir -p %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/lib
3031
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
3132
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/
3233
install -p -d -m 755 %{buildroot}%{_datadir}/%{name}
33-
install -p -m 755 target/release/%{name} %{buildroot}%{_bindir}/
34-
install -p -m 755 target/release/%{name}.bash-completion %{buildroot}%{_datadir}/bash-completion/completions/
35-
install -p -m 755 target/release/%{name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/
36-
install -p -m 755 target/release/_%{name} %{buildroot}%{_datadir}/zsh/site-functions/
34+
install -p -m 755 target/release/super %{buildroot}%{_bindir}/
35+
install -p -m 755 target/release/super.bash-completion %{buildroot}%{_datadir}/bash-completion/completions/
36+
install -p -m 755 target/release/super.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/
37+
install -p -m 755 target/release/_super %{buildroot}%{_datadir}/zsh/site-functions/
3738
install -p -m 755 -D vendor/dex2jar-2.1-SNAPSHOT/lib/* %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/lib/
3839
install -p -m 755 -D vendor/dex2jar-2.1-SNAPSHOT/*.sh %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/
3940
install -p -m 644 -D vendor/dex2jar-2.1-SNAPSHOT/LICENSE.txt %{buildroot}%{_datadir}/%{name}/vendor/dex2jar-2.1-SNAPSHOT/
40-
install -p -m 644 -D templates/%{name}/css/* %{buildroot}%{_datadir}/%{name}/templates/%{name}/css/
41-
install -p -m 644 -D templates/%{name}/img/* %{buildroot}%{_datadir}/%{name}/templates/%{name}/img/
42-
install -p -m 644 -D templates/%{name}/js/* %{buildroot}%{_datadir}/%{name}/templates/%{name}/js/
43-
install -p -m 644 -D templates/%{name}/*.hbs %{buildroot}%{_datadir}/%{name}/templates/%{name}/
41+
install -p -m 644 -D templates/%{name}/css/* %{buildroot}%{_datadir}/%{name}/templates/super/css/
42+
install -p -m 644 -D templates/%{name}/img/* %{buildroot}%{_datadir}/%{name}/templates/super/img/
43+
install -p -m 644 -D templates/%{name}/js/* %{buildroot}%{_datadir}/%{name}/templates/super/js/
44+
install -p -m 644 -D templates/%{name}/*.hbs %{buildroot}%{_datadir}/%{name}/templates/super/
4445
install -p -m 755 -D vendor/*.jar %{buildroot}%{_datadir}/%{name}/vendor/
4546
install -p -m 644 -D vendor/*.txt %{buildroot}%{_datadir}/%{name}/vendor/
4647
install -p -m 644 rules.json %{buildroot}%{_sysconfdir}/%{name}/

‎src/config.rs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -690,14 +690,14 @@ impl Default for Config {
690690
#[cfg(target_family = "unix")]
691691
fn default() -> Config {
692692
let mut config = Config::local_default();
693-
let etc_rules = PathBuf::from("/etc/super/rules.json");
693+
let etc_rules = PathBuf::from("/etc/super-analyzer/rules.json");
694694
if etc_rules.exists() {
695695
config.rules_json = etc_rules;
696696
}
697697
let share_path = Path::new(if cfg!(target_os = "macos") {
698-
"/usr/local/super"
698+
"/usr/local/super-analyzer"
699699
} else {
700-
"/usr/share/super"
700+
"/usr/share/super-analyzer"
701701
});
702702
if share_path.exists() {
703703
config.dex2jar_folder = share_path.join("vendor/dex2jar-2.1-SNAPSHOT");
@@ -814,11 +814,11 @@ mod tests {
814814
assert_eq!(config.get_results_folder(), Path::new("results"));
815815
assert_eq!(config.get_template_name(), "super");
816816
let share_path = Path::new(if cfg!(target_os = "macos") {
817-
"/usr/local/super"
817+
"/usr/local/super-analyzer"
818818
} else if cfg!(target_family = "windows") {
819819
""
820820
} else {
821-
"/usr/share/super"
821+
"/usr/share/super-analyzer"
822822
});
823823
let share_path = if share_path.exists() {
824824
share_path
@@ -832,8 +832,9 @@ mod tests {
832832
assert_eq!(config.get_templates_folder(), share_path.join("templates"));
833833
assert_eq!(config.get_template_path(),
834834
share_path.join("templates").join("super"));
835-
if cfg!(target_family = "unix") && Path::new("/etc/super/rules.json").exists() {
836-
assert_eq!(config.get_rules_json(), Path::new("/etc/super/rules.json"));
835+
if cfg!(target_family = "unix") && Path::new("/etc/super-analyzer/rules.json").exists() {
836+
assert_eq!(config.get_rules_json(),
837+
Path::new("/etc/super-analyzer/rules.json"));
837838
} else {
838839
assert_eq!(config.get_rules_json(), Path::new("rules.json"));
839840
}
@@ -906,15 +907,16 @@ mod tests {
906907
assert_eq!(config.get_dist_folder(), Path::new("dist"));
907908
assert_eq!(config.get_results_folder(), Path::new("results"));
908909
assert_eq!(config.get_dex2jar_folder(),
909-
Path::new("/usr/share/super/vendor/dex2jar-2.1-SNAPSHOT"));
910+
Path::new("/usr/share/super-analyzer/vendor/dex2jar-2.1-SNAPSHOT"));
910911
assert_eq!(config.get_jd_cmd_file(),
911-
Path::new("/usr/share/super/vendor/jd-cmd.jar"));
912+
Path::new("/usr/share/super-analyzer/vendor/jd-cmd.jar"));
912913
assert_eq!(config.get_templates_folder(),
913-
Path::new("/usr/share/super/templates"));
914+
Path::new("/usr/share/super-analyzer/templates"));
914915
assert_eq!(config.get_template_path(),
915-
Path::new("/usr/share/super/templates/super"));
916+
Path::new("/usr/share/super-analyzer/templates/super"));
916917
assert_eq!(config.get_template_name(), "super");
917-
assert_eq!(config.get_rules_json(), Path::new("/etc/super/rules.json"));
918+
assert_eq!(config.get_rules_json(),
919+
Path::new("/etc/super-analyzer/rules.json"));
918920
assert_eq!(config.get_unknown_permission_criticality(),
919921
Criticality::Low);
920922
assert_eq!(config.get_unknown_permission_description(),

0 commit comments

Comments
 (0)