Guwan
/
ldap-matter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove changes from other branches

This commit is contained in:
Angus B. Grieve-Smith 2020-05-01 16:06:18 -04:00
parent 177d6f85b0
commit ebe47e7daf
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oauth/config.php
View File

@ -1,5 +0,0 @@
<?php
$url_scheme = "https";
?>

2
oauth/resource.php
View File

@ -33,7 +33,7 @@ $ldap = new LDAP($ldap_host, $ldap_port, $ldap_version);
try {
$data = $ldap->getDataForMattermost($ldap_base_dn, $ldap_filter, $ldap_bind_dn, $ldap_bind_pass, $ldap_search_attribute, $user);
// Here is the patch for Mattermost 4.4 and newer. Gitlab has changed the JSON output of oauth service. Many data are not used by Mattermost, but there is a stack error if we delete them. That's the reason why date and many parameters are null or empty.
// Here is the patch for Mattermost 4.4 and older. Gitlab has changed the JSON output of oauth service. Many data are not used by Mattermost, but there is a stack error if we delete them. That's the reason why date and many parameters are null or empty.
$resp = array("id" => $assoc_id,"name" => $data['cn'],"username" => $user,"state" => "active","avatar_url" => "","web_url" => "","created_at" => "0000-00-00T00:00:00.000Z","bio" => null,"location" => null,"skype" => "","linkedin" => "","twitter" => "","website_url" => "","organization" => null,"last_sign_in_at" => "0000-00-00T00:00:00.000Z","confirmed_at" => "0000-00-00T00:00:00.000Z","last_activity_on" => null,"email" => $data['mail'],"theme_id" => 1,"color_scheme_id" => 1,"projects_limit" => 100000,"current_sign_in_at" => "0000-00-00T00:00:00.000Z","identities" => array(array("provider" => "ldapmain","extern_uid" => $data['dn'])),"can_create_group" => true,"can_create_project" => true,"two_factor_enabled" => false,"external" => false,"shared_runners_minutes_limit" => null);
// Below is the old version, still consistent with Mattermost before version 4.4

22
oauth/token.php
View File

@ -6,27 +6,7 @@
// include our OAuth2 Server object
require_once __DIR__.'/server.php';
require_once __DIR__.'/config.php';
/*
The Mattermost server seems to be returning bare http urls, even if
there is no http url in the config.json. If we are using https we
need to modify them.
*/
$redirect_url_scheme = substr($_POST["redirect_uri"], 0, 5);
if ($url_scheme == "https" && $redirect_url_scheme == "http:") {
$_POST["redirect_uri"] = "https" . substr($_POST["redirect_uri"], 4);
}
/*
Handle a request for an OAuth2.0 Access Token and send the response
to the client
*/
// Handle a request for an OAuth2.0 Access Token and send the response to the client
$server->handleTokenRequest(OAuth2\Request::createFromGlobals())->send();
?>