diff --git a/app/views/admin/webservice_access/index.php b/app/views/admin/webservice_access/index.php
deleted file mode 100644
index 86367aa5176d6d8639dded13324a042e7bbae6b6..0000000000000000000000000000000000000000
--- a/app/views/admin/webservice_access/index.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-# Lifter010: TODO
-
-/**
- * @var Admin_WebserviceAccessController $controller
- * @var WebserviceAccessRule[] $ws_rules
- */
-?>
-<h3><?=_("Liste der Zugriffsregeln")?></h3>
-<form action="<?=$controller->url_for('admin/webservice_access/update#edit')?>" method="post" class="default">
-<?=CSRFProtection::tokenTag()?>
-<table class="default">
-<tr>
- <th style="width: 30%;">
- <?= _('API-Key') ?>
- </th>
- <th style="width: 30%;">
- <?= _('Methode') ?>
- </th>
- <th style="width: 30%;">
- <?= _('IP Bereich') ?>
- </th>
- <th style="width: 5%;">
- <?= _('Typ') ?>
- </th>
- <th style="width: 5%;">
- <?= _('Aktion') ?>
- </th>
-</tr>
-<? foreach ($ws_rules as $rule): ?>
- <tr>
- <? if (isset($edit) && $edit == $rule->id) :?>
- <td>
- <a name="edit"></a>
- <input name="ws_rule_id" type="hidden" value="<?=$rule->id?>">
- <input name="ws_rule_api_key" style="width:90%" type="text" required value="<?= htmlReady($rule->api_key) ?>">
- </td>
- <td>
- <input name="ws_rule_method" style="width:90%" type="text" value="<?= htmlReady($rule->method) ?>">
- </td>
- <td>
- <input name="ws_rule_ip_range" style="width:90%" type="text" value="<?= htmlReady($rule->ip_range) ?>">
- </td>
- <td>
- <select name="ws_rule_type">
- <option <?=($rule->type == 'allow' ? 'selected' : '') ?>>allow</option>
- <option <?=($rule->type == 'deny' ? 'selected' : '') ?>>deny</option>
- </select>
- </td>
- <td>
- <?= Icon::create('accept', Icon::ROLE_ACCEPT)->asInput([
- 'title' => _('Änderungen speichern'),
- 'type' => 'image',
- 'class' => 'middle',
- 'name' => 'ok',
- ]) ?>
- <?= Icon::create('decline', Icon::ROLE_ATTENTION)->asInput([
- 'title' => _('Abbrechen'),
- 'type' => 'image',
- 'class' => 'middle',
- 'name' => 'cancel',
- ]) ?>
- </td>
- <? else : ?>
- <td>
- <?= htmlReady($rule->api_key) ?>
- </td>
- <td>
- <?= htmlReady($rule->method) ?>
- </td>
- <td>
- <?= htmlReady($rule->ip_range) ?>
- </td>
- <td>
- <?= htmlReady($rule->type) ?>
- </td>
- <td>
- <a href="<?= $controller->url_for('admin/webservice_access/edit/'.$rule->id.'#edit') ?>">
- <?= Icon::create('edit')->asImg(['title' => _('bearbeiten')]) ?>
- </a>
- <a href="<?= $controller->url_for('admin/webservice_access/delete/'.$rule->id) ?>">
- <?= Icon::create('trash')->asImg(['title' => _('löschen')]) ?>
- </a>
- </td>
- <? endif;?>
- </tr>
-<? endforeach ?>
-</table>
-</form>
-<?
-$sidebar = Sidebar::Get();
-
-$actions = new ActionsWidget();
-$actions->addLink(
- _('Regeln testen'),
- $controller->url_for('admin/webservice_access/test'),
- Icon::create('unit-test')
-);
-$actions->addLink(
- _('Neue Zugriffsregel anlegen'),
- $controller->url_for('admin/webservice_access/new'),
- Icon::create('add')
-);
-
-$sidebar->addWidget($actions);
diff --git a/app/views/admin/webservice_access/test.php b/app/views/admin/webservice_access/test.php
deleted file mode 100644
index 0b05dce7463a2ab48aa6b46781b9c5dd94f81aa3..0000000000000000000000000000000000000000
--- a/app/views/admin/webservice_access/test.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * @var Admin_WebserviceAccessController $controller
- */
-
-use Studip\Button, Studip\LinkButton;
-?>
-<form action="<?=$controller->url_for('admin/webservice_access/test')?>" method="post" class="default">
- <?=CSRFProtection::tokenTag()?>
- <fieldset>
- <legend>
- <?=_("Testen der Zugriffsregeln")?>
- </legend>
-
- <label>
- <?= _('API KEY') ?>
- <input type="text" name="test_api_key" size="50" required value="<?=htmlReady(Request::get("test_api_key"))?>">
- </label>
-
- <label>
- <?= _('Methode') ?></td>
- <input type="text" name="test_method" size="50" required value="<?=htmlReady(Request::get("test_method"))?>">
- </label>
-
- <label>
- <?= _('IP Adresse') ?></td>
- <input type="text" name="test_ip" size="50" required value="<?=htmlReady(Request::get("test_ip"))?>">
- </label>
- </fieldset>
-
- <footer>
- <?= Button::createAccept(_('Abschicken'), 'ok', ['title' => _('Test starten')])?>
- <?= LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/webservice_access'), ['title' => _('Test abbrechen')])?>
- </footer>
-</form>
-
-<?
-$sidebar = Sidebar::Get();
-
-$actions = new ActionsWidget();
-$actions->addLink(
- _('Liste der Zugriffsregeln'),
- $controller->url_for('admin/webservice_access'),
- Icon::create('add')
-);
-$actions->addLink(
- _('Neue Zugriffsregel anlegen'),
- $controller->url_for('admin/webservice_access/new'),
- Icon::create('add')
-);
-
-$sidebar->addWidget($actions);
diff --git a/lib/models/WebserviceAccessRule.php b/lib/models/WebserviceAccessRule.php
deleted file mode 100644
index 857830a3abb3cbfa8d67540545b892b920938a6c..0000000000000000000000000000000000000000
--- a/lib/models/WebserviceAccessRule.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * WebserviceAccessRule.php
- * model class for table webservice_access_rules
- * this class represents one record of the table webservice_access_rules
- * the column ip_range is converted from a comma separated list to an ArrayObject and vice-versa,
- * to allow array-like access
- *
- * Example:
- * @code
- * $rule = WebserviceAccessRule::find($id);
- * echo $rule['ip_range']; //prints out e.g. 127.0.0.1
- * $rule['ip_range'][] = '192.168.19.0/8';
- * echo $rule['ip_range']; //prints out 127.0.0.1,192.168.19.0/8
- * @endcode
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * @author André Noack <noack@data-quest.de>
- * @copyright 2011 Stud.IP Core-Group
- * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category Stud.IP
- *
- * @property string $api_key database column
- * @property string $method database column
- * @property CSVArrayObject $ip_range database column
- * @property string $type database column
- * @property int $id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-class WebserviceAccessRule extends SimpleORMap
-{
- protected static function configure($config = [])
- {
- $config['db_table'] = 'webservice_access_rules';
- $config['serialized_fields']['ip_range'] = CSVArrayObject::class;
- parent::configure($config);
- }
-
- /**
- * returns all rules for an given api key
- *
- * @param string $api_key
- * @return array of WebserviceAccessRule objects
- */
- static function findByApiKey($api_key)
- {
- return self::findByapi_key($api_key, " ORDER BY type");
- }
-
- /**
- * returns all rules in db sorted by api key
- *
- * @return array of WebserviceAccessRule objects
- */
- static function findAll()
- {
- return self::findBySQL("1 ORDER BY api_key, type");
- }
-
- /**
- * Checks for given api key, methodname and IP Address if access
- * is granted or not
- *
- * @param string $api_key an api key
- * @param string $method a name of an webservice method
- * @param string $ip an IP Address
- * @return boolean returns true if access fpr given params is allowed
- */
- static function checkAccess($api_key, $method, $ip)
- {
- $rules = self::findByApiKey($api_key);
- $access = false;
- foreach ($rules as $rule) {
- if ($rule->type == 'allow'
- && $rule->checkIpInRange($ip)
- && $rule->checkMethodName($method)) {
- $access = true;
- }
- if ($rule->type == 'deny'
- && $rule->checkIpInRange($ip)
- && $rule->checkMethodName($method)) {
- $access = false;
- }
- }
- return $access;
- }
-
- /**
- * checks, if a given IP Address is in the range specified
- * for this rule. If there is no specified range, it returns true
- *
- * @param string $check_ip an IP Address
- * @return boolean true if given Address is in specified range
- */
- function checkIpInRange($check_ip)
- {
- $ip_addr = inet_pton($check_ip);
-
- if (!count($this->ip_range)) {
- return true;
- }
- foreach ($this->ip_range as $range) {
- if (strpos($range, '/') !== false) {
- list($range, $bits) = explode('/', $range);
- $range = inet_pton($range) ?: '';
- $mask = str_repeat(chr(0), strlen($range));
-
- for ($i = 0; $i < strlen($mask); ++$i) {
- if ($bits >= 8) {
- $bits -= 8;
- } else {
- $mask[$i] = chr((1 << 8 - $bits) - 1);
- $bits = 0;
- }
- }
-
- $ip_start = $range & ~$mask;
- $ip_end = $range | $mask;
- } else {
- $ip_start = inet_pton($range);
- $ip_end = inet_pton($range);
- }
-
- if (strcmp($ip_start, $ip_addr) <= 0 && strcmp($ip_addr, $ip_end) <= 0) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * checks, if the specified method name for this rule
- * is part of the given one.
- * If there is no specified method name, it returns true
- *
- *
- * @param string $method a webservice method name
- * @return boolean true if given name matches the specified
- */
- function checkMethodName($method)
- {
- return ($method && (!$this->method || mb_strpos($method, $this->method) !== false));
- }
-}