-
Notifications
You must be signed in to change notification settings - Fork 0
/
piwik-openaire-dspace5.diff
executable file
·2039 lines (2037 loc) · 69.2 KB
/
piwik-openaire-dspace5.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/dspace/config/launcher.xml b/dspace/config/launcher.xml
index 931b461fa..3d5eb3320 100644
--- a/dspace/config/launcher.xml
+++ b/dspace/config/launcher.xml
@@ -403,4 +403,28 @@
<class>org.dspace.app.util.Version</class>
</step>
</command>
+ <command>
+ <name>resend-to-matomo</name>
+ <description>Create Matomo DB for Missing Usage Events</description>
+ <arguments>-create</arguments>
+ <step>
+ <class>com.openaire.piwik.tracker.OpenAirePiwikTrackerUnreportedDB</class>
+ </step>
+ </command>
+ <command>
+ <name>resend-to-matomo</name>
+ <description>Retry sending all Missing Usage Events to Matomo</description>
+ <arguments>-retry</arguments>
+ <step>
+ <class>com.openaire.piwik.tracker.OpenAirePiwikTrackerUnreportedDB</class>
+ </step>
+ </command>
+ <command>
+ <name>resend-to-matomo</name>
+ <description>Delete Usage Events Sent to Matomo</description>
+ <arguments>-delete</arguments>
+ <step>
+ <class>com.openaire.piwik.tracker.OpenAirePiwikTrackerUnreportedDB</class>
+ </step>
+ </command>
</commands>
diff --git a/dspace/config/modules/oapiwik.cfg b/dspace/config/modules/oapiwik.cfg
new file mode 100755
index 000000000..350688b27
--- /dev/null
+++ b/dspace/config/modules/oapiwik.cfg
@@ -0,0 +1,26 @@
+
+
+#------------------------#
+# OpenAIRE Piwik Tracker #
+#------------------------#
+#Base Tracker URL
+piwik.trackerURL = https://analytics.openaire.eu/piwik.php
+
+#Piwik siteID
+piwik.siteID = 1
+
+#Piwik Authentication Token
+piwik.tokenAuth=32846584f571be9b57488bf4088f30ea
+
+#IP Address Anonymization Bytes. Values in {1,2,3}
+#piwik.ipanonymizationbytes=2
+
+# Flag to enable/disable tracking. Default is true
+piwik.enabled = true
+
+
+# Flag whether failed reports of views should be stored in a database to resend them later
+piwik.retry = true
+
+# Location of the SQLite DB on the file system is [dspace]/oapiwik.piwik.matomoDbLocation
+piwik.matomoDbLocation = var/Matomo.db
diff --git a/dspace/config/spring/jspui/openaire-piwik-xmlui.xml b/dspace/config/spring/jspui/openaire-piwik-xmlui.xml
new file mode 100755
index 000000000..d2c2e7ee6
--- /dev/null
+++ b/dspace/config/spring/jspui/openaire-piwik-xmlui.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+ <bean id="piwikOpenAire" class="com.openaire.piwik.tracker.OpenAirePiwikTracker" lazy-init="true">
+ </bean>
+
+</beans>
diff --git a/dspace/config/spring/xmlui/openaire-piwik-xmlui.xml b/dspace/config/spring/xmlui/openaire-piwik-xmlui.xml
new file mode 100755
index 000000000..d2c2e7ee6
--- /dev/null
+++ b/dspace/config/spring/xmlui/openaire-piwik-xmlui.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+ <bean id="piwikOpenAire" class="com.openaire.piwik.tracker.OpenAirePiwikTracker" lazy-init="true">
+ </bean>
+
+</beans>
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
index 108119db4..068f10b14 100644
--- a/dspace/modules/additions/pom.xml
+++ b/dspace/modules/additions/pom.xml
@@ -96,7 +96,12 @@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>com.openaire</groupId>
+ <artifactId>openaire-piwik-api</artifactId>
+ <version>1.0.0</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/dspace/modules/jspui/pom.xml b/dspace/modules/jspui/pom.xml
index cc572ed82..9601551b1 100644
--- a/dspace/modules/jspui/pom.xml
+++ b/dspace/modules/jspui/pom.xml
@@ -85,7 +85,13 @@
<groupId>org.dspace.modules</groupId>
<artifactId>additions</artifactId>
</dependency>
-
+ <!-- OpenAire Piwik Tracker -->
+ <dependency>
+ <groupId>com.openaire</groupId>
+ <artifactId>openaire-piwik-api</artifactId>
+ <version>1.0.0</version>
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-jspui</artifactId>
diff --git a/dspace/modules/openaire-piwik/openaire-piwik-api/pom.xml b/dspace/modules/openaire-piwik/openaire-piwik-api/pom.xml
new file mode 100755
index 000000000..8cfc2e4c1
--- /dev/null
+++ b/dspace/modules/openaire-piwik/openaire-piwik-api/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.openaire</groupId>
+ <artifactId>openaire-piwik</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <groupId>com.openaire</groupId>
+ <artifactId>openaire-piwik-api</artifactId>
+ <version>1.0.0</version>
+ <packaging>jar</packaging>
+ <name>OpenAIRE Piwik Tracker API</name>
+ <url>openaire.eu</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dspace</groupId>
+ <artifactId>dspace-api</artifactId>
+
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.21.0.1</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/AbstractUsageEventListener.java b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/AbstractUsageEventListener.java
new file mode 100755
index 000000000..c6a6db7bb
--- /dev/null
+++ b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/AbstractUsageEventListener.java
@@ -0,0 +1,70 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package com.openaire.piwik.tracker;
+
+import org.dspace.services.EventService;
+import org.dspace.services.model.EventListener;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+
+/**
+ * AbstractUsageEventListener is used as the base class for listening events running
+ * in the EventService.
+ *
+ * @author Mark Diggory (mdiggory at atmire.com)
+ * @version $Revision: $
+ */
+public abstract class AbstractUsageEventListener implements EventListener, BeanPostProcessor {
+
+ public AbstractUsageEventListener() {
+ super();
+ }
+
+ @Override
+ public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+ return bean;
+ }
+
+ @Override
+ public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+ if(beanName.equals("org.dspace.services.EventService"))
+ {
+ setEventService((EventService) bean);
+ }
+ return bean;
+ }
+
+ /**
+ * Empty String[] flags to have Listener
+ * consume any event name prefixes.
+ */
+ public String[] getEventNamePrefixes() {
+ return new String[0];
+ }
+
+ /**
+ * Currently consumes events generated for
+ * all resources.
+ */
+ public String getResourcePrefix() {
+ return null;
+ }
+
+ public void setEventService(EventService service) {
+ if(service != null)
+ {
+ service.registerEventListener(this);
+ }
+ else
+ {
+ throw new IllegalStateException("EventService handed to Listener cannot be null");
+ }
+
+ }
+
+}
diff --git a/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTracker.java b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTracker.java
new file mode 100755
index 000000000..9150dbe41
--- /dev/null
+++ b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTracker.java
@@ -0,0 +1,426 @@
+/*
+ * OpenAirePiwikTracker.java
+ *
+ * Version: 0.2
+ * Date: 2018-05-20
+* Initial version @mire. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package com.openaire.piwik.tracker;
+
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.concurrent.FutureCallback;
+import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
+import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
+import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.log4j.Logger;
+import org.dspace.core.ConfigurationManager;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.Item;
+import org.dspace.core.Constants;
+import org.dspace.services.model.Event;
+import org.dspace.usage.UsageEvent;
+
+import com.google.gson.Gson;
+/**
+ * User: dpie (dpierrakos at gmail.com)
+ * Date:
+ * Time:
+ */
+public class OpenAirePiwikTracker extends AbstractUsageEventListener
+{
+ /* Log4j logger */
+ private static Logger log = Logger.getLogger(OpenAirePiwikTracker.class);
+
+ // Base URl of the Piwik platform
+ private String piwikbaseUrl;
+
+ // Piwik Site ID
+ private String piwikSiteID;
+
+ // Piwik IP Anonumization Bytes
+ private int piwikIPAnonymizationBytes;
+
+ // Piwik Site Authentication Token
+ private String piwikTokenAuth;
+
+ // Flag if Piwik is enabled for current installation. Might be disabled for
+ // test instances e.g..
+ private boolean piwikEnabled;
+
+ // Flag if mising requests are stored in local DB for retry
+ private boolean piwikRetry;
+
+ // Flag if a proxy is in front of the DSpace instance
+ private boolean useProxies;
+
+ // The URL of this DSpace instance
+ private String dspaceURL;
+
+ // The host name of this DSpace instance
+ private String dspaceHostName;
+
+ // Async http client to prevent waiting for piwik server
+ private CloseableHttpAsyncClient httpClient;
+
+ // Pooling connection manager for httpClient
+ private PoolingNHttpClientConnectionManager connectionManager;
+
+ // The time out for a single connection if piwik is slow or unreachable.
+ private static final int CONNECTION_TIMEOUT = 5 * 1000;
+
+ // The number of connections per route
+ private static final int NUMBER_OF_CONNECTIONS_PER_ROUTE = 100;
+
+ // If there are more than MAX_NUMBER_OF_PENDING_CONNECTIONS waiting to be
+ // served events wont be send to Piwik
+ private static final int MAX_NUMBER_OF_PENDING_CONNECTIONS = 10;
+
+ /**
+ * Constructor to initialize the HTTP Client. We only need one per instance
+ * as it is able to handle multiple requests by multiple Threads at once.
+ *
+ */
+ public OpenAirePiwikTracker()
+ {
+ try
+ {
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setConnectTimeout(CONNECTION_TIMEOUT)
+ .setSocketTimeout(CONNECTION_TIMEOUT).build();
+ DefaultConnectingIOReactor ioreactor;
+ ioreactor = new DefaultConnectingIOReactor();
+ connectionManager = new PoolingNHttpClientConnectionManager(
+ ioreactor);
+ connectionManager
+ .setDefaultMaxPerRoute(NUMBER_OF_CONNECTIONS_PER_ROUTE);
+ httpClient = HttpAsyncClients.custom()
+ .setDefaultRequestConfig(requestConfig)
+ .setConnectionManager(connectionManager).build();
+
+ httpClient.start();
+ }
+ catch (Exception e)
+ {
+ log.error(
+ "Piwik Tracker couldn't be initialized. There will be no tracking until server restart.",
+ e);
+ httpClient = null;
+ }
+}
+
+ /**
+ * Read the Piwik configuration options
+ */
+ private void readConfiguration()
+ {
+ // Piwik variables
+ piwikEnabled = ConfigurationManager.getBooleanProperty("oapiwik", "piwik.enabled");
+ piwikbaseUrl = ConfigurationManager.getProperty("oapiwik", "piwik.trackerURL");
+ piwikSiteID = ConfigurationManager.getProperty("oapiwik", "piwik.siteID");
+ piwikTokenAuth = ConfigurationManager.getProperty("oapiwik","piwik.tokenAuth");
+
+ piwikIPAnonymizationBytes = ConfigurationManager.getIntProperty("oapiwik","piwik.ipanonymizationbytes");
+
+ piwikRetry = ConfigurationManager.getBooleanProperty("oapiwik", "piwik.retry");
+
+ // DSpace variables
+ useProxies = ConfigurationManager.getBooleanProperty("useProxies");
+
+ dspaceURL = ConfigurationManager.getProperty("dspace.url");
+ dspaceHostName = ConfigurationManager.getProperty("dspace.hostname");
+
+ }
+
+ @Override
+ public void receiveEvent(final Event event)
+ {
+
+ if (!(event instanceof UsageEvent))
+ {
+ return;
+ }
+
+ try
+ {
+ this.readConfiguration();
+ if (!piwikEnabled || httpClient == null)
+ {
+ return;
+ }
+
+ if (connectionManager.getTotalStats()
+ .getPending() >= MAX_NUMBER_OF_PENDING_CONNECTIONS)
+ {
+ log.error(
+ "Event could not be sent to Piwik server due to insufficient available connections");
+ return;
+ }
+
+ log.debug("Usage event received " + event.getName());
+
+ UsageEvent ue = (UsageEvent) event;
+ if (ue.getAction() == UsageEvent.Action.VIEW)
+ {
+ // Item Download Case
+ if (ue.getObject().getType() == Constants.BITSTREAM)
+ {
+ Bitstream bitstream = (Bitstream) ue.getObject();
+ if (bitstream.getBundles().length > 0)
+ {
+ Bundle bundle = bitstream.getBundles()[0];
+ if (bundle.getItems().length > 0)
+ {
+ Item item = bundle.getItems()[0];
+ this.logEvent(item, bitstream, ue.getRequest());
+ }
+ }
+ }
+ // Item View Case
+ if (ue.getObject().getType() == Constants.ITEM)
+ {
+ Item item = (Item) ue.getObject();
+ this.logEvent(item, null, ue.getRequest());
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ log.error(e.getMessage());
+ }
+ }
+
+ /**
+ * Builds the URI to send the event to the configured Piwik instance and
+ * sends the request.
+ */
+ private void logEvent(final Item item, final Bitstream bitstream,
+ final HttpServletRequest request)
+ throws IOException, URISyntaxException
+ {
+ URIBuilder builder = new URIBuilder();
+ builder.setPath(piwikbaseUrl);
+ builder.addParameter("idsite", piwikSiteID);
+ builder.addParameter("cip", this.getIPAddress(request));
+ builder.addParameter("rec", "1");
+ builder.addParameter("token_auth", piwikTokenAuth);
+ builder.addParameter("action_name", item.getName());
+
+ // Agent Information
+ String agent = StringUtils
+ .defaultIfBlank(request.getHeader("USER-AGENT"), "");
+ builder.addParameter("ua", agent);
+
+ // Referer Information
+ String urlref = StringUtils.defaultIfBlank(request.getHeader("referer"),
+ "");
+ builder.addParameter("urlref", urlref);
+
+ // Country information in case of IPAnonymization
+ if (piwikIPAnonymizationBytes > 0 && piwikIPAnonymizationBytes < 4)
+ {
+ String country = "";
+ try
+ {
+ Locale locale = request.getLocale();
+ country = locale.getCountry();
+ }
+ catch (Exception e)
+ {
+ log.error("Cannot get locale", e);
+ }
+ builder.addParameter("country", country);
+ }
+
+ if (bitstream != null)
+ {
+ // Bitstream information in case of download event
+ StringBuffer sb = new StringBuffer(dspaceURL);
+ sb.append("/bitstream/handle/").append(item.getHandle())
+ .append("/");
+ sb.append(bitstream.getName());
+ builder.addParameter("url", sb.toString());
+ builder.addParameter("download", sb.toString());
+
+ }
+ else
+ {
+ // Item information in case of Item view event
+ builder.addParameter("url",
+ dspaceURL + "/handle/" + item.getHandle());
+ }
+
+ // Piwik Custom Variable for OAI-PMH ID tracking
+ Gson gson = new Gson();
+ Map<String, String[]> jsonPiwikCustomVars = new HashMap<>();
+ String[] oaipmhID = new String[] { "oaipmhID",
+ "oai:" + dspaceHostName + ":" + item.getHandle() };
+ jsonPiwikCustomVars.put("1", oaipmhID);
+ builder.addParameter("cvar", gson.toJson(jsonPiwikCustomVars));
+
+ this.sendRequest(builder.build());
+ }
+
+ /**
+ * Get the IP-Address from the given request. Handles cases where a Proxy is
+ * involved and IP-Address anonymization. Not yet working with IPv6
+ *
+ * @param request
+ * @return
+ * @throws UnknownHostException
+ */
+ private String getIPAddress(final HttpServletRequest request)
+ throws UnknownHostException
+ {
+ String clientIP = request.getRemoteAddr();
+ if (useProxies && request.getHeader("X-Forwarded-For") != null)
+ {
+ /* This header is a comma delimited list */
+ for (String xfip : request.getHeader("X-Forwarded-For").split(","))
+ {
+ /*
+ * proxy itself will sometime populate this header with the same
+ * value in remote address. ordering in spec is vague, we'll
+ * just take the last not equal to the proxy
+ */
+ if (!request.getHeader("X-Forwarded-For").contains(clientIP))
+ {
+ clientIP = xfip.trim();
+ }
+ }
+ }
+
+ // IP anonymization case
+
+ if (piwikIPAnonymizationBytes > 0 && piwikIPAnonymizationBytes < 4)
+ {
+
+ // Check IPv4 or IPv6
+ InetAddress ipadress = InetAddress.getByName(clientIP);
+ if (ipadress instanceof Inet6Address)
+ {
+ clientIP = "0.0.0.0";
+ }
+ else
+ {
+ switch (piwikIPAnonymizationBytes)
+ {
+ case 1:
+ clientIP = clientIP.substring(0,
+ StringUtils.ordinalIndexOf(clientIP, ".", 3))
+ + ".0";
+ break;
+ case 2:
+ clientIP = clientIP.substring(0,
+ StringUtils.ordinalIndexOf(clientIP, ".", 2))
+ + ".0.0";
+ break;
+ case 3:
+ clientIP = clientIP.substring(0,
+ StringUtils.ordinalIndexOf(clientIP, ".", 1))
+ + ".0.0.0";
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "Invalid IP bytes: " + piwikIPAnonymizationBytes);
+ }
+ }
+ }
+
+ return clientIP;
+ }
+
+ /**
+ * Send the request to the given URI. Ignores the result except
+ * for a status code check.
+ */
+ private void sendRequest(final URI uri)
+ {
+ final HttpGet request = new HttpGet(uri);
+ httpClient.execute(request, new FutureCallback<HttpResponse>()
+ {
+ @Override
+ public void completed(final HttpResponse response)
+ {
+ if (response.getStatusLine()
+ .getStatusCode() == HttpStatus.SC_OK)
+ {
+ log.info("Sent usage event to piwik");
+ }
+ else
+ {
+ log.error("Error sending reqeust to Piwik." + " -> "
+ + response.getStatusLine());
+ }
+ }
+
+ @Override
+ public void failed(final Exception ex)
+ {
+ log.error("Error sending usage event to Piwik", ex);
+ try
+ {
+ if (piwikRetry)
+ {
+ OpenAirePiwikTrackerUnreported unreportedReq = new OpenAirePiwikTrackerUnreported();
+ unreportedReq.storeRequest(uri.toString());
+ log.info("Missing request stored to local DB");
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Error storing unreported request");
+ }
+ }
+
+ @Override
+ public void cancelled()
+ {
+ log.info("Request cancelled");
+ }
+
+ });
+ }
+
+}
diff --git a/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTrackerUnreported.java b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTrackerUnreported.java
new file mode 100755
index 000000000..69ce2cba3
--- /dev/null
+++ b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTrackerUnreported.java
@@ -0,0 +1,86 @@
+/*
+ * OpenAirePiwikTrackerUnreported.java
+ *
+ * Version: 0.1
+ * Date: 2018-05-20
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package com.openaire.piwik.tracker;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.Calendar;
+
+import org.apache.log4j.Logger;
+
+/**
+ * User: dpie (dpierrakos at gmail.com) Date: Time:
+ */
+public class OpenAirePiwikTrackerUnreported
+{
+
+ private static Logger log = Logger
+ .getLogger(OpenAirePiwikTrackerUnreported.class);
+
+ public OpenAirePiwikTrackerUnreported()
+ {
+ try
+ {
+ // The JDBC driver loading doesn't work for webapps without this.
+ // http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html#DriverManager,_the_service_provider_mechanism_and_memory_leaks
+ Class.forName("org.sqlite.JDBC");
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.error("Could not load sqlite JDBC driver");
+ }
+ }
+
+ public void storeRequest(String requestLost) throws Exception
+ {
+
+ try (Connection conn = DriverManager.getConnection(
+ OpenAirePiwikTrackerUnreportedDB.getMatomoDatabaseUrl());
+ Statement stmt = conn.createStatement();)
+ {
+
+ log.info("Connected to Matomo DB...");
+
+ Timestamp currentTimestamp = new java.sql.Timestamp(
+ Calendar.getInstance().getTime().getTime());
+ String sqlInsertMissingRequestsToDB = "INSERT INTO MissingInformation (time_req,url,isSend) "
+ + "VALUES ('" + currentTimestamp + "','" + requestLost
+ + "',0);";
+
+ stmt.execute(sqlInsertMissingRequestsToDB);
+ }
+ catch (SQLException e)
+ {
+ log.error(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTrackerUnreportedDB.java b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTrackerUnreportedDB.java
new file mode 100755
index 000000000..3f5c1b454
--- /dev/null
+++ b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTrackerUnreportedDB.java
@@ -0,0 +1,151 @@
+/*
+ * OpenAirePiwikTrackerUnreportedDB.java
+ *
+ * Version: 0.1
+ * Date: 2018-05-20
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package com.openaire.piwik.tracker;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import org.dspace.core.ConfigurationManager;
+
+/**
+ * User: dpie (dpierrakos at gmail.com) Date: Time:
+**/
+public class OpenAirePiwikTrackerUnreportedDB
+{
+
+ public static String getMatomoDatabaseUrl()
+ {
+ String dspaceDir = ConfigurationManager.getProperty("dspace.dir");
+
+ String matomoDbLocation = ConfigurationManager.getProperty("oapiwik","piwik.matomoDbLocation");
+
+ String connectionStringMatomoDB = "jdbc:sqlite:" + dspaceDir + "/"
+ + matomoDbLocation;
+
+ return connectionStringMatomoDB;
+ }
+
+ public static void main(String[] args) throws Exception
+ {
+
+ String argument = args[0];
+ if (!("-create".equals(argument)) && !("-retry".equals(argument))
+ && !("-delete".equals(argument)))
+ {
+ System.out.println("Usage: dspace.dir/bin/dspace -create or -retry or -delete");
+ return;
+ }
+
+ try (Connection conn = DriverManager
+ .getConnection(getMatomoDatabaseUrl());
+ Statement stmt = conn.createStatement();)
+ {
+
+ System.out.println("Connected to Matomo DB...");
+ if (argument.equals("-create"))
+ {
+
+ String sqlCreate = "CREATE TABLE IF NOT EXISTS MissingInformation (time_req TEXT PRIMARY KEY, url TEXT NOT NULL, isSend INTEGER NOT NULL);";
+ stmt.executeUpdate(sqlCreate);
+ }
+ else if (argument.equals("-retry"))
+ {
+
+ try (ResultSet rs = stmt.executeQuery(
+ "SELECT time_req, url FROM MissingInformation where isSend=0;");)
+ {
+ String urlUnreported = "";
+ String time_req = "";
+
+ HashMap<String, String> timestampURLMap = new HashMap<String, String>();
+
+ if (!rs.isBeforeFirst())
+ System.out.println("No pending missing requests");
+
+ else
+ {
+ while (rs.next())
+ {
+ time_req = rs.getString("time_req");
+ urlUnreported = rs.getString("url");
+ timestampURLMap.put(time_req, urlUnreported);
+ }
+ }
+
+ for (Map.Entry<String, String> entry : timestampURLMap
+ .entrySet())
+ {
+ String timeStamp = entry.getKey();
+ String urlForReport = entry.getValue();
+
+ URL obj = new URL(urlForReport + "&cdt="
+ + URLEncoder.encode(timeStamp,
+ StandardCharsets.UTF_8.name()));
+ HttpURLConnection con = (HttpURLConnection) obj
+ .openConnection();
+ int responseCode = con.getResponseCode();
+ if (responseCode == 200)
+ {
+ String sqlUpdate = "";
+
+ sqlUpdate = "UPDATE MissingInformation set isSend=1 where time_req='"
+ + timeStamp + "';";
+ stmt.executeUpdate(sqlUpdate);
+ System.out.println("Unreported Event sent");
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ System.out.println(e);
+ }
+ }
+ else if (argument.equals("-delete"))
+ {
+
+ String sqlPurge = "DELETE FROM MissingInformation where isSend=1;";
+ int deletedRowCount = stmt.executeUpdate(sqlPurge);
+ System.out.println(deletedRowCount
+ + " missing requests have already been sent to Matomo and deleted from local DB");
+
+ }
+ }
+ catch (Exception e)
+ {
+ System.out.println("Error in creating table " + e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/org/dspace/core/ConfigurationManager.java b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/org/dspace/core/ConfigurationManager.java
new file mode 100644
index 000000000..116313cef
--- /dev/null
+++ b/dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/org/dspace/core/ConfigurationManager.java
@@ -0,0 +1,1024 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.core;
+
+import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
+import org.apache.log4j.helpers.OptionConverter;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Class for reading the DSpace system configuration. The main configuration is
+ * read in as properties from a standard properties file. Email templates and
+ * configuration files for other tools are also be accessed via this class.
+ * <P>
+ * The main configuration is by default read from the <em>resource</em>
+ * <code>/dspace.cfg</code>.
+ * To specify a different configuration, the system property
+ * <code>dspace.configuration</code> should be set to the <em>filename</em>
+ * of the configuration file.
+ * <P>
+ * Other configuration files are read from the <code>config</code> directory
+ * of the DSpace installation directory (specified as the property
+ * <code>dspace.dir</code> in the main configuration file.)
+ *
+ *
+ * @author Robert Tansley
+ * @author Larry Stone - Interpolated values.
+ * @author Mark Diggory - General Improvements to detection, logging and loading.
+ * @version $Revision$
+ */
+public class ConfigurationManager
+{
+ /** log4j category */
+ private static Logger log = Logger.getLogger(ConfigurationManager.class);