Merge pull request #419 from nextcloud/backport/418/stable20

[stable20] Trying to access offset on null on maxmind reader

Author: nickvergessen

lib/CountryDetector.php

@@ -46,13 +46,18 @@ public function getCountry(): string {
 			$reader = new Reader(__DIR__ . '/../vendor/GeoLite2-Country.mmdb');
 			$record = $reader->get($this->request->getRemoteAddress());
 		} catch (\Exception $e) {
-			return '--';
+			return CountryMapper::GLOBAL;
 		}
 
-		if($this->countryMapper->isValidCountry($record['country']['iso_code'])) {
+		if ($record === null) {
+			// No match found, e.g. for local address like 127.0.0.1
+			return CountryMapper::GLOBAL;
+		}
+
+		if ($this->countryMapper->isValidCountry($record['country']['iso_code'])) {
 			return $record['country']['iso_code'];
 		}
 
-		return '--';
+		return CountryMapper::GLOBAL;
 	}
 }

lib/Db/Mapper/CountryMapper.php

@@ -24,6 +24,9 @@
 use OCP\IL10N;
 
 class CountryMapper {
+
+	public const GLOBAL = '--';
+
 	/** @var IL10N */
 	private $l;
 
@@ -48,7 +51,7 @@ public function isValidCountry($countryCode): bool {
 	 */
 	public function getCountries(): array {
 		$countries = [
-			'--' => $this->l->t('Global'),
+			self::GLOBAL => $this->l->t('Global'),
 			'AF' => $this->l->t('Afghanistan'),
 			'AX' => $this->l->t('Åland Islands'),
 			'AL' => $this->l->t('Albania'),

lib/Db/Mapper/TermsMapper.php

@@ -55,8 +55,8 @@ public function getTermsForCountryCode(string $countryCode): array {
 		}
 		$result->closeCursor();
 
-		if (empty($entities) && $countryCode !== '--') {
-			return $this->getTermsForCountryCode('--');
+		if (empty($entities) && $countryCode !== CountryMapper::GLOBAL) {
+			return $this->getTermsForCountryCode(CountryMapper::GLOBAL);
 		}
 
 		return $entities;