summaryrefslogtreecommitdiffstats
path: root/modules/oauth
diff options
context:
space:
mode:
Diffstat (limited to 'modules/oauth')
-rwxr-xr-xmodules/oauth/bin/demo.php1
-rw-r--r--modules/oauth/lib/Consumer.php3
-rw-r--r--modules/oauth/lib/OAuthStore.php2
-rw-r--r--modules/oauth/lib/Registry.php21
-rw-r--r--modules/oauth/templates/registry.list.php6
-rw-r--r--modules/oauth/www/registry.edit.php6
-rw-r--r--modules/oauth/www/registry.php4
7 files changed, 4 insertions, 39 deletions
diff --git a/modules/oauth/bin/demo.php b/modules/oauth/bin/demo.php
index b1dcf52..f224ac3 100755
--- a/modules/oauth/bin/demo.php
+++ b/modules/oauth/bin/demo.php
@@ -22,7 +22,6 @@ try {
// Needed in order to make session_start to be called before output is printed.
$session = SimpleSAML_Session::getSessionFromRequest();
- //$baseurl = (isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'https://foodle.feide.no/simplesaml');
$baseurl = (isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'http://mars.foodle.local/simplesaml');
$key = (isset($_SERVER['argv'][2]) ? $_SERVER['argv'][2] : 'key');
$secret = (isset($_SERVER['argv'][3]) ? $_SERVER['argv'][3] : 'secret');
diff --git a/modules/oauth/lib/Consumer.php b/modules/oauth/lib/Consumer.php
index 6a16841..8e3e5ae 100644
--- a/modules/oauth/lib/Consumer.php
+++ b/modules/oauth/lib/Consumer.php
@@ -130,8 +130,6 @@ class sspmod_oauth_Consumer {
$opts = array(
'ssl' => array(
'verify_peer' => FALSE,
- // 'cafile' => $file,
- // 'local_cert' => $spKeyCertFile,
'capture_peer_cert' => TRUE,
'capture_peer_chain' => TRUE,
),
@@ -158,7 +156,6 @@ class sspmod_oauth_Consumer {
$opts = stream_context_create($opts);
}
$data = file_get_contents($data_req->to_url(), FALSE, $opts);
- #print_r($data);
$dataDecoded = json_decode($data, TRUE);
return $dataDecoded;
diff --git a/modules/oauth/lib/OAuthStore.php b/modules/oauth/lib/OAuthStore.php
index 4e6960a..6a239a6 100644
--- a/modules/oauth/lib/OAuthStore.php
+++ b/modules/oauth/lib/OAuthStore.php
@@ -111,7 +111,6 @@ class sspmod_oauth_OAuthStore extends OAuthDataStore {
$callback = NULL;
if ($consumer['value']['callback_url']) $callback = $consumer['value']['callback_url'];
- // SimpleSAML_Logger::info('OAuth consumer dump(' . var_export($consumer, TRUE) . ')');
if ($consumer['value']['RSAcertificate']) {
return new OAuthConsumer($consumer['value']['key'], $consumer['value']['RSAcertificate'], $callback);
} else {
@@ -159,7 +158,6 @@ class sspmod_oauth_OAuthStore extends OAuthDataStore {
function new_access_token($requestToken, $consumer, $verifier = null) {
SimpleSAML_Logger::info('OAuth new_access_token(' . $requestToken . ',' . $consumer . ')');
$accestoken = new OAuthToken(SimpleSAML\Utils\Random::generateID(), SimpleSAML\Utils\Random::generateID());
- // SimpleSAML_Logger::info('OAuth new_access_token(' . $requestToken . ',' . $consumer . ',' . $accestoken . ')');
$this->store->set('access', $accestoken->key, $consumer->key, $accestoken, $this->config->getValue('accessTokenDuration', 60*60*24) );
return $accestoken;
}
diff --git a/modules/oauth/lib/Registry.php b/modules/oauth/lib/Registry.php
index 8ae9f93..b8eb7fa 100644
--- a/modules/oauth/lib/Registry.php
+++ b/modules/oauth/lib/Registry.php
@@ -107,17 +107,10 @@ class sspmod_oauth_Registry {
}
public function metaToForm($metadata) {
- // $this->flattenLanguageField($metadata, 'name');
- // $this->flattenLanguageField($metadata, 'description');
-
- return '<form action="registry.edit.php" method="post">' .
+ return '<form action="registry.edit.php" method="post">' .
'<div id="tabdiv">' .
'<ul>' .
- '<li><a href="#basic">Name and descrition</a></li>' .
- // '<li><a href="#saml">SAML 2.0</a></li>' .
- // '<li><a href="#attributes">Attributes</a></li>' .
- // '<li><a href="#orgs">Organizations</a></li>' .
- // '<li><a href="#contacts">Contacts</a></li>' .
+ '<li><a href="#basic">Name and descrition</a></li>' .
'</ul>' .
'<div id="basic"><table class="formtable">' .
$this->standardField($metadata, 'name', 'Name of client') .
@@ -127,17 +120,9 @@ class sspmod_oauth_Registry {
$this->readonlyField($metadata, 'secret', 'Consumer Secret<br/>(Used for HMAC_SHA1 signatures)') .
$this->standardField($metadata, 'RSAcertificate', 'RSA certificate (PEM)<br/>(Used for RSA_SHA1 signatures)', TRUE) .
$this->standardField($metadata, 'callback_url', 'Static/enforcing callback-url') .
-
-// $this->hiddenField('field_key', $metadata['key']) .
$this->hiddenField('field_secret', $metadata['secret']) .
- '</table></div>' .
- // '<div id="saml"><table class="formtable">' .
- // $this->standardField($metadata, 'AssertionConsumerService', 'AssertionConsumerService endpoint') .
- // $this->standardField($metadata, 'SingleLogoutService', 'SingleLogoutService endpoint') .
- // // $this->standardField($metadata, 'certFingerprint', 'Certificate Fingerprint') .
- //
- // '</table></div>' .
+ '</table></div>' .
'</div>' .
'<input type="submit" name="submit" value="Save" style="margin-top: 5px" />' .
'</form>';
diff --git a/modules/oauth/templates/registry.list.php b/modules/oauth/templates/registry.list.php
index 0d11fd6..b1cdbc9 100644
--- a/modules/oauth/templates/registry.list.php
+++ b/modules/oauth/templates/registry.list.php
@@ -2,12 +2,6 @@
$this->data['jquery'] = array('version' => '1.6', 'core' => TRUE, 'ui' => TRUE, 'css' => TRUE);
$this->data['head'] = '<link rel="stylesheet" type="text/css" href="/' . $this->data['baseurlpath'] . 'module.php/oauth/resources/style.css" />' . "\n";
-// $this->data['head'] .= '<script type="text/javascript">
-// $(document).ready(function() {
-// $("#tabdiv").tabs();
-// });
-// </script>';
-
$this->includeAtTemplateBase('includes/header.php');
diff --git a/modules/oauth/www/registry.edit.php b/modules/oauth/www/registry.edit.php
index ca5ba80..1ce979a 100644
--- a/modules/oauth/www/registry.edit.php
+++ b/modules/oauth/www/registry.edit.php
@@ -7,10 +7,8 @@ $oauthconfig = SimpleSAML_Configuration::getOptionalConfig('module_oauth.php');
$store = new sspmod_core_Storage_SQLPermanentStorage('oauth');
-//$authsource = $oauthconfig->getValue('auth', 'admin');
$authsource = "admin"; // force admin to authenticate as registry maintainer
$useridattr = $oauthconfig->getValue('useridattr', 'user');
-//$useridattr = $oauthconfig->getValue('useridattr', 'uid');
if ($session->isValid($authsource)) {
$attributes = $session->getAuthData($authsource, 'Attributes');
@@ -52,9 +50,7 @@ if (isset($_POST['submit'])) {
$entry = $editor->formToMeta($_POST, array(), array('owner' => $userid));
requireOwnership($entry, $userid);
-
-# echo('<pre>Created: '); print_r($entry); exit;
-
+
$store->set('consumers', $entry['key'], '', $entry);
$template = new SimpleSAML_XHTML_Template($config, 'oauth:registry.saved.php');
diff --git a/modules/oauth/www/registry.php b/modules/oauth/www/registry.php
index 52b06f2..dfea928 100644
--- a/modules/oauth/www/registry.php
+++ b/modules/oauth/www/registry.php
@@ -7,10 +7,8 @@ $oauthconfig = SimpleSAML_Configuration::getOptionalConfig('module_oauth.php');
$store = new sspmod_core_Storage_SQLPermanentStorage('oauth');
-//$authsource = $oauthconfig->getValue('auth', 'admin');
$authsource = "admin"; // force admin to authenticate as registry maintainer
$useridattr = $oauthconfig->getValue('useridattr', 'user');
-//$useridattr = $oauthconfig->getValue('useridattr', 'uid');
if ($session->isValid($authsource)) {
$attributes = $session->getAuthData($authsource, 'Attributes');
@@ -52,8 +50,6 @@ foreach($list AS $listitem) {
$slist['others'][] = $listitem;
}
-// echo('<pre>'); print_r($slist); exit;
-
$template = new SimpleSAML_XHTML_Template($config, 'oauth:registry.list.php');
$template->data['entries'] = $slist;
$template->data['userid'] = $userid;
generated by cgit v1.1 at 2025-05-31 16:13:32 +0000