Skip to content
Snippets Groups Projects
Commit 8a9b8695 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Admin panel bugfix and Docker changes

parent aa3aa31b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Dockerfile
+ 8
− 3
View file @ 8a9b8695
......@@ -15,10 +15,13 @@ RUN apt-get update && \
make \
wget \
ca-certificates \
ssl-cert \
vim
# Copying Shibboleth SP configuration
COPY docker/shibboleth2.xml /etc/shibboleth/
COPY docker/shibboleth/shibboleth2.xml /etc/shibboleth/
COPY docker/shibboleth/sp-key.pem /etc/shibboleth/
COPY docker/shibboleth/sp-cert.pem /etc/shibboleth/
# Installing Embedded Discovery Service
WORKDIR /usr/local/src
......@@ -39,6 +42,8 @@ RUN a2enconf rap.conf
# Enable mod_rewrite (for Flight framework)
RUN a2enmod rewrite
RUN a2enmod ssl
RUN a2ensite default-ssl
# Copying RAP php files
WORKDIR /var/www/html
......@@ -48,5 +53,5 @@ WORKDIR /var/www/html/rap-ia2
RUN mkdir -p logs
RUN chown -R www-data logs
# Starting Apache
CMD apachectl -D FOREGROUND
# Starting shibd & Apache
CMD service shibd start && apachectl -D FOREGROUND
classes/Locator.php
+ 1
− 1
View file @ 8a9b8695
......@@ -25,7 +25,7 @@ class Locator {
}
public function getProtocol(): string {
return stripos($_SERVER['SERVER_PROTOCOL'], 'https') ? 'https://' : 'http://';
return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ? 'https://' : 'http://';
}
public function getBasePath(): string {
......
docker/rap.conf
+ 27
− 0
View file @ 8a9b8695
<Directory /var/www/html/rap-ia2/>
AllowOverride All
</Directory>
<Directory /var/www/html/rap-ia2/auth/x509/>
Options Indexes FollowSymLinks
AllowOverride None
Order allow,deny
allow from all
SSLVerifyClient require
SSLVerifyDepth 10
SSLOptions +ExportCertData
</Directory>
<Location /rap-ia2/auth/eduGAIN>
AuthType shibboleth
ShibRequestSetting requireSession 1
Require valid-user
</Location>
#<Directory /var/www/html/rap-ia2/auth/eduGAIN/>
# AuthType shibboleth
# ShibRequestSetting requireSession 1
# Require valid-user
#</Directory>
<Directory /var/www/html/rap-ia2/logs/>
Order deny,allow
Deny From All
</Directory>
include/admin.php
+ 12
− 11
View file @ 8a9b8695
......@@ -7,9 +7,10 @@
function checkUser() {
startSession();
session_start();
global $locator;
global $session;
$session = $locator->getSession();
if ($session->getUser() === null) {
http_response_code(401);
die("You must be registered to perform this action");
......@@ -29,9 +30,9 @@ Flight::route('GET /admin', function() {
Flight::route('GET /admin/oauth2_clients', function() {
checkUser();
global $dao;
global $locator;
$clients = $dao->getOAuth2Clients();
$clients = $locator->getOAuth2ClientDAO()->getOAuth2Clients();
Flight::json($clients);
});
......@@ -39,9 +40,9 @@ Flight::route('GET /admin/oauth2_clients', function() {
Flight::route('POST /admin/oauth2_clients', function() {
checkUser();
global $dao;
global $locator;
$client = $dao->createOAuth2Client(buildOAuth2ClientFromData());
$client = $locator->getOAuth2ClientDAO()->createOAuth2Client(buildOAuth2ClientFromData());
Flight::json($client);
});
......@@ -49,9 +50,9 @@ Flight::route('POST /admin/oauth2_clients', function() {
Flight::route('PUT /admin/oauth2_clients', function() {
checkUser();
global $dao;
global $locator;
$client = $dao->updateOAuth2Client(buildOAuth2ClientFromData());
$client = $locator->getOAuth2ClientDAO()->updateOAuth2Client(buildOAuth2ClientFromData());
Flight::json($client);
});
......@@ -59,9 +60,9 @@ Flight::route('PUT /admin/oauth2_clients', function() {
Flight::route('DELETE /admin/oauth2_clients/@id', function($id) {
checkUser();
global $dao;
global $locator;
$dao->deleteOAuth2Client($id);
$locator->getOAuth2ClientDAO()->deleteOAuth2Client($id);
// Return no content
Flight::halt(204);
......@@ -76,7 +77,7 @@ function buildOAuth2ClientFromData() {
if (isset($data['id'])) {
$client->id = $data['id'];
}
$client->name = $data['name'];
$client->title = $data['title'];
$client->icon = $data['icon'];
$client->client = $data['client'];
$client->secret = $data['secret'];
......
include/front-controller.php
+ 4
− 3
View file @ 8a9b8695
......@@ -133,7 +133,7 @@ Flight::route('GET /logout', function() {
});
function sendAuthRedirect($url) {
startSession();
session_start();
// reload callback from query to avoid problem with session shared between
// multiple browser tabs
setCallback(Flight::request()->query['callback']);
......@@ -218,8 +218,9 @@ Flight::route('/local', function() {
*/
Flight::route('GET /x509-name-surname', function() {
startSession();
global $session, $BASE_PATH, $VERSION;
session_start();
global $locator, $BASE_PATH, $VERSION;
$session = $locator->getSession();
if ($session->getX509DataToRegister() !== null && $session->getX509DataToRegister()->name === null) {
Flight::render('x509-name-surname.php', array('title' => 'Select name and surname',
......
views/admin/index.php
+ 4
− 4
View file @ 8a9b8695
......@@ -24,15 +24,15 @@ include 'include/header.php';
<button class="btn btn-primary pull-right" v-on:click="saveOAuth2Client(client, index)" v-if="client.edit">
<span class="glyphicon glyphicon-floppy-disk"></span> Save
</button>
<strong>{{client.name}}</strong>
<strong>{{client.title}} &nbsp;</strong>
</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label" for="name">Name</label>
<label class="col-sm-3 control-label" for="title">Name</label>
<div class="col-sm-9">
<p class="form-control-static" v-if="!client.edit">{{client.name}}</p>
<input type="text" class="form-control" id="name" v-model="client.name" v-if="client.edit" />
<p class="form-control-static" v-if="!client.edit">{{client.title}}</p>
<input type="text" class="form-control" id="title" v-model="client.title" v-if="client.edit" />
</div>
</div>
<div class="form-group">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment