simplesamlphp /
simplesamlphp-module-ldap
| Conditions | 19 |
| Paths | 54 |
| Total Lines | 83 |
| Code Lines | 52 |
| Lines | 0 |
| Ratio | 0 % |
| Changes | 1 | ||
| Bugs | 0 | Features | 0 |
Small methods make your code easier to understand, in particular if combined with a good name. Besides, if your method is small, finding a good name is usually much easier.
For example, if you find yourself adding comments to a method's body, this is usually a good sign to extract the commented part to a new method, and use the comment as a starting point when coming up with a good name for this new method.
Commonly applied refactorings include:
If many parameters/temporary variables are present:
| 1 | <?php |
||
| 95 | public function process(array &$request): void |
||
| 96 | { |
||
| 97 | Assert::keyExists($request, 'Attributes'); |
||
| 98 | |||
| 99 | $attributes = &$request['Attributes']; |
||
| 100 | |||
| 101 | // perform a merge on the ldap_search_filter |
||
| 102 | // loop over the attributes and build the search and replace arrays |
||
| 103 | $arrSearch = []; |
||
| 104 | $arrReplace = []; |
||
| 105 | foreach ($attributes as $attr => $val) { |
||
| 106 | $arrSearch[] = '%' . $attr . '%'; |
||
| 107 | |||
| 108 | if (is_array($val) && count($val) > 0 && strlen($val[0]) > 0) { |
||
| 109 | $arrReplace[] = Ldap::escapeFilterValue($val[0]); |
||
| 110 | } else { |
||
| 111 | $arrReplace[] = ''; |
||
| 112 | } |
||
| 113 | } |
||
| 114 | |||
| 115 | // merge the attributes into the ldap_search_filter |
||
| 116 | $filter = str_replace($arrSearch, $arrReplace, $this->search_filter); |
||
|
Bug
introduced
by
|
|||
| 117 | |||
| 118 | if (strpos($filter, '%') !== false) { |
||
| 119 | Logger::info( |
||
| 120 | 'AttributeAddFromLDAP: There are non-existing attributes in the search filter. (' . |
||
| 121 | $this->search_filter . ')' |
||
| 122 | ); |
||
| 123 | return; |
||
| 124 | } |
||
| 125 | |||
| 126 | if (!in_array($this->attr_policy, ['merge', 'replace', 'add'], true)) { |
||
| 127 | Logger::warning("AttributeAddFromLDAP: 'attribute.policy' must be one of 'merge'," . |
||
| 128 | "'replace' or 'add'."); |
||
| 129 | return; |
||
| 130 | } |
||
| 131 | |||
| 132 | // getLdap |
||
| 133 | try { |
||
| 134 | $ldap = $this->getLdap(); |
||
| 135 | } catch (\Exception $e) { |
||
| 136 | // Added this warning in case $this->getLdap() fails |
||
| 137 | Logger::warning("AttributeAddFromLDAP: exception = " . $e); |
||
| 138 | return; |
||
| 139 | } |
||
| 140 | // search for matching entries |
||
| 141 | try { |
||
| 142 | $entries = $ldap->searchformultiple( |
||
| 143 | $this->base_dn, |
||
| 144 | $filter, |
||
| 145 | array_values($this->search_attributes), |
||
| 146 | true, |
||
| 147 | false |
||
| 148 | ); |
||
| 149 | } catch (\Exception $e) { |
||
| 150 | return; // silent fail, error is still logged by LDAP search |
||
| 151 | } |
||
| 152 | |||
| 153 | // handle [multiple] values |
||
| 154 | foreach ($entries as $entry) { |
||
| 155 | foreach ($this->search_attributes as $target => $name) { |
||
| 156 | if (is_numeric($target)) { |
||
| 157 | $target = $name; |
||
| 158 | } |
||
| 159 | |||
| 160 | if (isset($attributes[$target]) && $this->attr_policy === 'replace') { |
||
| 161 | unset($attributes[$target]); |
||
| 162 | } |
||
| 163 | $name = strtolower($name); |
||
| 164 | if (isset($entry[$name])) { |
||
| 165 | unset($entry[$name]['count']); |
||
| 166 | if (isset($attributes[$target])) { |
||
| 167 | foreach (array_values($entry[$name]) as $value) { |
||
| 168 | if ($this->attr_policy === 'merge') { |
||
| 169 | if (!in_array($value, $attributes[$target], true)) { |
||
| 170 | $attributes[$target][] = $value; |
||
| 171 | } |
||
| 172 | } else { |
||
| 173 | $attributes[$target][] = $value; |
||
| 174 | } |
||
| 175 | } |
||
| 176 | } else { |
||
| 177 | $attributes[$target] = array_values($entry[$name]); |
||
| 178 | } |
||
| 184 |
Loading history...