From 349b33644938a56f8a74e733dd469aedb2233e46 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 21 Apr 2017 16:17:49 +0200 Subject: [PATCH 01/12] added Virtuoso detection added Virtuoso detection, as requested in #1516 --- src/apps.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/apps.json b/src/apps.json index dffea9b8f..a636fb346 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8433,6 +8433,17 @@ "implies": "Joomla", "website": "http://virtuemart.net" }, + "Virtuoso": { + "cats": [ + "34" + ], + "meta": { + "Keywords": "^OpenLink Virtuoso Sparql", + "Copyright": "^Copyright © \\d{4} OpenLink Software" + }, + "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20" + "Server": "Virtuoso:*?\\;version:\\1" + }, "Visual WebGUI": { "cats": [ "18" From f9919596833d67fb6afdfe3a7f192d8c51125aa1 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 21 Apr 2017 16:22:51 +0200 Subject: [PATCH 02/12] updated virtuoso detection updated virtuoso detection --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index a636fb346..9d2f99f3e 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8441,7 +8441,7 @@ "Keywords": "^OpenLink Virtuoso Sparql", "Copyright": "^Copyright © \\d{4} OpenLink Software" }, - "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20" + "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", "Server": "Virtuoso:*?\\;version:\\1" }, "Visual WebGUI": { From dc2b03b95d3f7349483ea49fab4704b4dd8ada0b Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 15:40:14 +0200 Subject: [PATCH 03/12] updated virtuoso recognition updated virtuoso recognition: adjusted Server header regex --- src/apps.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 9d2f99f3e..d4091bfe8 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8442,7 +8442,9 @@ "Copyright": "^Copyright © \\d{4} OpenLink Software" }, "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", - "Server": "Virtuoso:*?\\;version:\\1" + "headers": { + "Server": "^.*Virtuoso\/(\d{2}.\d{2}.\d{4}).*$;version:\\1" + } }, "Visual WebGUI": { "cats": [ From abb41d3156efc14a57667ffcfbfa368a491b0dc0 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 15:42:50 +0200 Subject: [PATCH 04/12] updated virtuoso recognition updated virtuoso recognition: changed regex for "Server" header, which is more reliable than using `/sparql` --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index d4091bfe8..081fbaef7 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8443,7 +8443,7 @@ }, "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", "headers": { - "Server": "^.*Virtuoso\/(\d{2}.\d{2}.\d{4}).*$;version:\\1" + "Server": "^.*Virtuoso\\/(\\d{2}\\.\\d{2}\\.\\d{4}).*$;version:\\1" } }, "Visual WebGUI": { From a55a71feadc9fa8a7573ce180e7884464b369689 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:07:33 +0200 Subject: [PATCH 05/12] updates on virtuoso detection updates on virtuoso detection: updating regex for avoiding issues with travis CI --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 081fbaef7..4000881c5 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8443,7 +8443,7 @@ }, "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", "headers": { - "Server": "^.*Virtuoso\\/(\\d{2}\\.\\d{2}\\.\\d{4}).*$;version:\\1" + "Server": "^.*?Virtuoso\\/(\\d{2}\\.\\d{2}\\.\\d{4}).*?$;version:\\1" } }, "Visual WebGUI": { From 4149446b5286d52d4d21a24bee313eb504a549bd Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:11:59 +0200 Subject: [PATCH 06/12] updated regex for virtuoso detection updated regex for virtuoso detection --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 4000881c5..bee1fe559 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8443,7 +8443,7 @@ }, "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", "headers": { - "Server": "^.*?Virtuoso\\/(\\d{2}\\.\\d{2}\\.\\d{4}).*?$;version:\\1" + "Server": "^(?:.*)Virtuoso\\/(\\d{2}\\.\\d{2}\\.\\d{4})(?:.*)$;version:\\1" } }, "Visual WebGUI": { From 76b964ca8ee9872afcb257a59c3f4c95df009e4d Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:15:54 +0200 Subject: [PATCH 07/12] updated virtuoso detection regex updated virtuoso detection regex --- src/apps.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index bee1fe559..a7b68b85d 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8443,7 +8443,9 @@ }, "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", "headers": { - "Server": "^(?:.*)Virtuoso\\/(\\d{2}\\.\\d{2}\\.\\d{4})(?:.*)$;version:\\1" + "Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1" + + "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1" } }, "Visual WebGUI": { From 0c205c95d8cb81ad93627528372d89038da87df1 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:19:20 +0200 Subject: [PATCH 08/12] updated regex for virtuoso version detection updated regex for virtuoso version detection --- src/apps.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/apps.json b/src/apps.json index a7b68b85d..583c18f51 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8443,8 +8443,6 @@ }, "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", "headers": { - "Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1" - "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1" } }, From 4aa28571c0a11eaf5c181ef1b8f46e941e9e3984 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:27:48 +0200 Subject: [PATCH 09/12] updating virtuoso detection updating virtuoso detection: the `/sparql` endpoint should be found, but it could be provided by other vendors, so we can use a low confidence value --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 583c18f51..98abd0414 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8441,7 +8441,7 @@ "Keywords": "^OpenLink Virtuoso Sparql", "Copyright": "^Copyright © \\d{4} OpenLink Software" }, - "url": "^https?://(?:[^\\/]+\\.)?.*?/sparql\\;confidence:20", + "url": "(?:)[^\/]+\/sparql\\;confidence:20", "headers": { "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1" } From 961011c4e6b2bcbf51c7bcbc8d25b79c3b1c19f2 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Fri, 19 May 2017 16:35:24 +0200 Subject: [PATCH 10/12] updating virtuoso detection updating virtuoso detection --- src/apps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/apps.json b/src/apps.json index 98abd0414..3af8188a3 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8437,6 +8437,7 @@ "cats": [ "34" ], + "website": "https://virtuoso.openlinksw.com/", "meta": { "Keywords": "^OpenLink Virtuoso Sparql", "Copyright": "^Copyright © \\d{4} OpenLink Software" From 037dfd24d3f0e855b1921a81d7bfb93243949503 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Sun, 21 May 2017 18:48:52 +0200 Subject: [PATCH 11/12] updatd virtuoso detection updatd virtuoso detection --- src/apps.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 3af8188a3..4a2f93dee 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8442,7 +8442,6 @@ "Keywords": "^OpenLink Virtuoso Sparql", "Copyright": "^Copyright © \\d{4} OpenLink Software" }, - "url": "(?:)[^\/]+\/sparql\\;confidence:20", "headers": { "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1" } From 009a186cdc113d572dcd4650f852fb001dc730c4 Mon Sep 17 00:00:00 2001 From: Alfredo Serafini Date: Sun, 21 May 2017 19:07:12 +0200 Subject: [PATCH 12/12] updating virtuoso detection updating virtuoso detection --- src/apps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/apps.json b/src/apps.json index 4a2f93dee..345f4097f 100755 --- a/src/apps.json +++ b/src/apps.json @@ -8442,6 +8442,7 @@ "Keywords": "^OpenLink Virtuoso Sparql", "Copyright": "^Copyright © \\d{4} OpenLink Software" }, + "url": ".*/sparql\\.*", "headers": { "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1" }