Merge pull request #20 from dasgarner/develop

Update for alpine 3.11

.dockerignore

@@ -0,0 +1,2 @@
+config.json
+vendor/

Dockerfile

@@ -2,16 +2,23 @@ FROM composer:1.6 as composer
 COPY . /app
 RUN composer install --no-interaction --no-dev --ignore-platform-reqs --optimize-autoloader
 
-FROM alpine:3.6
-MAINTAINER Spring Signage Ltd <[email protected]>
+FROM alpine:3.11
+MAINTAINER Xibo Signage Ltd <[email protected]>
 
 ENV XMR_DEBUG false
 ENV XMR_QUEUE_POLL 5
 ENV XMR_QUEUE_SIZE 10
 ENV XMR_IPV6RESPSUPPORT false
 ENV XMR_IPV6PUBSUPPORT false
 
-RUN apk update && apk upgrade && apk add tar php7 curl php7-zmq php7-phar php7-json php7-openssl && rm -rf /var/cache/apk/*
+RUN apk update && apk upgrade && apk add tar \
+    php7 \
+    curl \
+    php7-zmq \
+    php7-phar \
+    php7-json \
+    php7-openssl \
+    && rm -rf /var/cache/apk/*
 
 EXPOSE 9505 50001
 

composer.json

@@ -7,24 +7,30 @@
     "spring signage"
   ],
   "homepage": "http://xibo.org.uk",
-  "license": "AGPL-3.0",
+  "license": "AGPL-3.0-or-later",
   "authors": [
     {
       "name": "Daniel Garner",
       "homepage": "https://github.com/dasgarner"
     },
     {
-      "name": "Spring Signage Ltd",
-      "homepage": "http://springsignage.com"
+      "name": "Xibo Signage Ltd",
+      "homepage": "https://xibo.org.uk"
     },
     {
       "name": "Xibo Contributors",
       "homepage": "https://github.com/xibosignage/xibo/tree/master/contributors"
     }
   ],
   "bin": ["bin/xmr.phar"],
+  "config": {
+    "platform": {
+      "php": "7.0.8",
+      "ext-zmq": "1"
+    }
+  },
   "require": {
-    "php": ">=5.5",
+    "php": ">=7.0.8",
     "monolog/monolog": "^1.17",
     "react/zmq": "^0.3.0"
   }

docker-compose.yml

@@ -4,4 +4,6 @@ services:
   xmr:
     build: .
     environment:
-      XMR_DEBUG: "true"
+      XMR_DEBUG: "true"
+    volumes:
+      - ./:/opt/xmr

index.php

@@ -1,9 +1,24 @@
 #!/usr/bin/env php
 <?php
-/*
- * Spring Signage Ltd - http://www.springsignage.com
- * Copyright (C) 2015-2017 Spring Signage Ltd
- * (index.php)
+/**
+ * Copyright (C) 2020 Xibo Signage Ltd
+ *
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  *
 sequenceDiagram
 Player->> CMS: Register

tests/playerReq.php

@@ -0,0 +1,19 @@
+<?php
+/*
+*  Hello World client
+*  Connects REQ socket to tcp://localhost:5555
+*  Sends "Hello" to server, expects "World" back
+* @author Ian Barber <ian(dot)barber(at)gmail(dot)com>
+*/
+
+$context = new ZMQContext();
+
+//  Socket to talk to server
+echo "Connecting to hello world server…\n";
+$requester = new ZMQSocket($context, ZMQ::SOCKET_REQ);
+$requester->connect("tcp://192.168.86.88:58587");
+echo "connected\n";
+$requester->send("Hello");
+echo "sent\n";
+$reply = $requester->recv();
+echo "Received reply " . $reply;

tests/playerSub.php

@@ -1,8 +1,23 @@
 <?php
-/*
- * Spring Signage Ltd - http://www.springsignage.com
- * Copyright (C) 2015-18 Spring Signage Ltd
- * (playerSub.php)
+/**
+ * Copyright (C) 2020 Xibo Signage Ltd
+ *
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  *
  * This is a player subscription mock file.
  * docker exec -it xiboxmr_xmr_1 sh -c "cd /opt/xmr/tests; php playerSub.php 1234"
@@ -16,19 +31,21 @@
 $identity = $argv[1];
 
 // Use the same settings as the running XMR instance
-$config = json_decode(file_get_contents('../config.json'));
+#$config = json_decode(file_get_contents('../config.json'));
 
 $fp = fopen('key.pem', 'r');
 $privateKey = openssl_get_privatekey(fread($fp, 8192));
 fclose($fp);
 
+echo 'Sub to: ' . $identity;
+
 // Sub
 $loop = React\EventLoop\Factory::create();
 
 $context = new React\ZMQ\Context($loop);
 
 $sub = $context->getSocket(ZMQ::SOCKET_SUB);
-$sub->connect($config->pubOn[0]);
+$sub->connect('tcp://192.168.86.88:36740');
 $sub->subscribe("H");
 $sub->subscribe($identity);
 
@@ -40,23 +57,13 @@
             return;
 
         // Expect messages to have a length of 3
-        if (count($msg) != 3)
-            throw new InvalidArgumentException('Incorrect Message Length');
+        //if (count($msg) != 3)
+        //    throw new InvalidArgumentException('Incorrect Message Length');
 
         // Message will be channel, key, message
-        if ($msg[0] != $identity)
-            throw new InvalidArgumentException('Channel does not match');
-
-        // Decrypt the message using our private key
-        $opened = null;
-
-        $key = base64_decode($msg[1]);
-        $message = base64_decode($msg[2]);
-
-        if (!openssl_open($message, $opened, $key, $privateKey))
-            throw new Exception('Encryption Error');
+        //if ($msg[0] != $identity)
+        //    throw new InvalidArgumentException('Channel does not match');
 
-        echo 'Message: ' . $opened . PHP_EOL;
     }
     catch (InvalidArgumentException $e) {
         echo $e->getMessage() . PHP_EOL;