/
IPService.php
393 lines (350 loc) · 11.1 KB
/
IPService.php
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
<?php
namespace Concrete\Core\Permission;
use Concrete\Core\Application\ApplicationAwareInterface;
use Concrete\Core\Application\ApplicationAwareTrait;
use Concrete\Core\Config\Repository\Repository;
use Concrete\Core\Database\Connection\Connection;
use Concrete\Core\Http\Request;
use Concrete\Core\Logging\Channels;
use Concrete\Core\Logging\LoggerAwareInterface;
use Concrete\Core\Logging\LoggerAwareTrait;
use Concrete\Core\Utility\IPAddress;
use DateTime;
use IPLib\Address\AddressInterface;
use IPLib\Factory as IPFactory;
use IPLib\Range\RangeInterface;
/**
* @deprecated check single methods to see the non-deprecated alternatives
*/
class IPService implements ApplicationAwareInterface, LoggerAwareInterface
{
use ApplicationAwareTrait;
use LoggerAwareTrait;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGEFLAG_BLACKLIST
*
* @var int
*/
const IPRANGEFLAG_BLACKLIST = IpAccessControlService::IPRANGEFLAG_BLACKLIST;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGEFLAG_WHITELIST
*
* @var int
*/
const IPRANGEFLAG_WHITELIST = IpAccessControlService::IPRANGEFLAG_WHITELIST;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGEFLAG_MANUAL
*
* @var int
*/
const IPRANGEFLAG_MANUAL = IpAccessControlService::IPRANGEFLAG_MANUAL;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGEFLAG_AUTOMATIC
*
* @var int
*/
const IPRANGEFLAG_AUTOMATIC = IpAccessControlService::IPRANGEFLAG_AUTOMATIC;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGETYPE_BLACKLIST_MANUAL
*
* @var int
*/
const IPRANGETYPE_BLACKLIST_MANUAL = IpAccessControlService::IPRANGETYPE_BLACKLIST_MANUAL;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGETYPE_BLACKLIST_AUTOMATIC
*
* @var int
*/
const IPRANGETYPE_BLACKLIST_AUTOMATIC = IpAccessControlService::IPRANGETYPE_BLACKLIST_AUTOMATIC;
/**
* @deprecated Use \Concrete\Core\Permission\IpAccessControlService::IPRANGETYPE_WHITELIST_MANUAL
*
* @var int
*/
const IPRANGETYPE_WHITELIST_MANUAL = IpAccessControlService::IPRANGETYPE_WHITELIST_MANUAL;
/**
* @var \Concrete\Core\Config\Repository\Repository
*/
protected $config;
/**
* @var \Concrete\Core\Database\Connection\Connection
*/
protected $connection;
/**
* @var \Concrete\Core\Http\Request
*/
protected $request;
/**
* @param \Concrete\Core\Config\Repository\Repository $config
* @param \Concrete\Core\Database\Connection\Connection $connection
* @param \Concrete\Core\Http\Request $request
*/
public function __construct(Repository $config, Connection $connection, Request $request)
{
$this->config = $config;
$this->connection = $connection;
$this->request = $request;
}
/**
* {@inheritdoc}
*
* @see \Concrete\Core\Logging\LoggerAwareInterface::getLoggerChannel()
*/
public function getLoggerChannel()
{
return Channels::CHANNEL_SECURITY;
}
/**
* @deprecated Use $app->make(\IPLib\Address\AddressInterface::class)
*
* @return \IPLib\Address\AddressInterface
*/
public function getRequestIPAddress()
{
return $this->app->make(AddressInterface::class);
}
/**
* @deprecated use $app->make('failed_login')->isDenylisted()
*
* @param \IPLib\Address\AddressInterface|null $ip
*
* @return bool
*/
public function isDenylisted(AddressInterface $ip = null)
{
return $this->getFailedLoginService()->isDenylisted($ip);
}
/**
* @deprecated use $app->make('failed_login')->isBlacklisted()
*
* @param \IPLib\Address\AddressInterface|null $ip
*
* @return bool
*/
public function isBlacklisted(AddressInterface $ip = null)
{
return $this->getFailedLoginService()->isBlacklisted($ip);
}
/**
* @deprecated use $app->make('failed_login')->isAllowlisted()
*
* @param \IPLib\Address\AddressInterface|null $ip
*
* @return bool
*/
public function isAllowlisted(AddressInterface $ip = null)
{
return $this->getFailedLoginService()->isAllowlisted($ip);
}
/**
* @deprecated use $app->make('failed_login')->isWhitelisted()
*
* @param \IPLib\Address\AddressInterface|null $ip
*
* @return bool
*/
public function isWhitelisted(AddressInterface $ip = null)
{
return $this->getFailedLoginService()->isWhitelisted($ip);
}
/**
* @deprecated use $app->make('failed_login')->getErrorMessage()
*
* @return string
*/
public function getErrorMessage()
{
return $this->getFailedLoginService()->getErrorMessage();
}
/**
* @deprecated use $app->make('failed_login')->registerEvent()
*
* @param \IPLib\Address\AddressInterface|null $ip
* @param bool $ignoreConfig
*/
public function logFailedLogin(AddressInterface $ip = null, $ignoreConfig = false)
{
return $this->getFailedLoginService()->registerEvent($ip, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->isThresholdReached()
*
* @param \IPLib\Address\AddressInterface|null $ip
* @param bool $ignoreConfig
*
* @return bool
*/
public function failedLoginsThresholdReached(AddressInterface $ip = null, $ignoreConfig = false)
{
return $this->getFailedLoginService()->isThresholdReached($ip, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->addToDenylistForThresholdReached()
*
* @param \IPLib\Address\AddressInterface $ip
* @param bool $ignoreConfig
*/
public function addToDenylistForThresholdReached(AddressInterface $ip = null, $ignoreConfig = false)
{
$this->getFailedLoginService()->addToDenylistForThresholdReached($ip, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->createRange()
*
* @param \IPLib\Range\RangeInterface $range
* @param int $type
* @param \DateTime|null $expiration
*
* @return \Concrete\Core\Permission\IPRange
*/
public function createRange(RangeInterface $range, $type, DateTime $expiration = null)
{
$rangeEntity = $this->getFailedLoginService()->createRange($range, $type, $expiration);
return IPRange::createFromEntity($rangeEntity);
}
/**
* @deprecated use $app->make('failed_login')->getRanges()
*
* @param int $type (one of the IPService::IPRANGETYPE_... constants)
* @param bool $includeExpired Include expired records?
*
* @return \Concrete\Core\Permission\IPRange[]|\Generator
*/
public function getRanges($type, $includeExpired = false)
{
$rangeEntities = $this->getFailedLoginService()->getRanges($type, $includeExpired);
foreach ($rangeEntities as $rangeEntity) {
yield IPRange::createFromEntity($rangeEntity);
}
}
/**
* @deprecated use $app->make('failed_login')->getRangeByID()
*
* @param int $id
*
* @return \Concrete\Core\Permission\IPRange|null
*/
public function getRangeByID($id)
{
$rangeEntity = $this->getFailedLoginService()->getRangeByID($id);
return $rangeEntity === null ? null : IPRange::createFromEntity($rangeEntity);
}
/**
* @deprecated use $app->make('failed_login')->deleteRange()
*
* @param \Concrete\Core\Permission\IPRange|int $range
*/
public function deleteRange($range)
{
if (!$range) {
return;
}
$id = $range instanceof IPRange ? $range->getID() : $range;
$this->getFailedLoginService()->deleteRange($id);
}
/**
* @deprecated use $app->make('failed_login')->deleteEvents()
*
* @param int|null $maxAge
*
* @return int
*/
public function deleteFailedLoginAttempts($maxAge = null)
{
return $this->getFailedLoginService()->deleteEvents($maxAge);
}
/**
* @deprecated use $app->make('failed_login')->deleteAutomaticDenylist()
*
* @param bool $onlyExpired
*
* @return int
*/
public function deleteAutomaticDenylist($onlyExpired = true)
{
return $this->getFailedLoginService()->deleteAutomaticDenylist($onlyExpired);
}
/**
* @deprecated Use $app->make(\IPLib\Address\AddressInterface::class)
*
* @return \Concrete\Core\Utility\IPAddress
*/
public function getRequestIP()
{
$ip = $this->app->make(AddressInterface::class);
return new IPAddress((string) $ip);
}
/**
* @deprecated use $app->make('failed_login')->isDenylisted()
*
* @param mixed $ip
*/
public function isBanned($ip = false)
{
$ipAddress = null;
if ($ip instanceof IPAddress) {
$ipAddress = IPFactory::parseAddressString($ip->getIp(IPAddress::FORMAT_IP_STRING));
}
return $this->getFailedLoginService()->isDenylisted($ipAddress);
}
/**
* @deprecated use $app->make('failed_login')->addToDenylistForThresholdReached()
*
* @param mixed $ip
* @param mixed $ignoreConfig
*/
public function createIPBan($ip = false, $ignoreConfig = false)
{
$ipAddress = null;
if ($ip instanceof IPAddress) {
$ipAddress = IPFactory::parseAddressString($ip->getIp(IPAddress::FORMAT_IP_STRING));
}
$this->getFailedLoginService()->addToDenylistForThresholdReached($ipAddress, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->registerEvent()
*
* @param bool $ignoreConfig
*/
public function logSignupRequest($ignoreConfig = false)
{
return $this->getFailedLoginService()->registerEvent(null, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->isThresholdReached()
*
* @param bool $ignoreConfig
*/
public function signupRequestThreshholdReached($ignoreConfig = false)
{
return $this->getFailedLoginService()->isThresholdReached(null, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->isThresholdReached()
*
* @param bool $ignoreConfig
*/
public function signupRequestThresholdReached($ignoreConfig = false)
{
return $this->getFailedLoginService()->isThresholdReached(null, $ignoreConfig);
}
/**
* @deprecated use $app->make('failed_login')->getRangeType()
*
* @param \IPLib\Address\AddressInterface $ip
*
* @return int|null
*/
protected function getRangeType(AddressInterface $ip)
{
$range = $this->getFailedLoginService()->getRange($ip);
return $range === null ? null : $range->getType();
}
/**
* @return \Concrete\Core\Permission\IpAccessControlService
*/
private function getFailedLoginService()
{
return $this->app->make('failed_login');
}
}