Commit b9cc400a15779cf8c9621ea1f52125c2534e99f6
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
d6c2eefe
base url improvements
Showing
3 changed files
with
6 additions
and
1 deletions
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
| @@ -116,6 +116,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { | @@ -116,6 +116,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { | ||
| 116 | generalSettings.setKey("general"); | 116 | generalSettings.setKey("general"); |
| 117 | ObjectNode node = objectMapper.createObjectNode(); | 117 | ObjectNode node = objectMapper.createObjectNode(); |
| 118 | node.put("baseUrl", "http://localhost:8080"); | 118 | node.put("baseUrl", "http://localhost:8080"); |
| 119 | + node.put("prohibitDifferentUrl", true); | ||
| 119 | generalSettings.setJsonValue(node); | 120 | generalSettings.setJsonValue(node); |
| 120 | adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, generalSettings); | 121 | adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, generalSettings); |
| 121 | 122 |
| @@ -39,6 +39,9 @@ | @@ -39,6 +39,9 @@ | ||
| 39 | ng-model="vm.settings.jsonValue.prohibitDifferentUrl"> | 39 | ng-model="vm.settings.jsonValue.prohibitDifferentUrl"> |
| 40 | {{ 'admin.prohibit-different-url' | translate }} | 40 | {{ 'admin.prohibit-different-url' | translate }} |
| 41 | </md-checkbox> | 41 | </md-checkbox> |
| 42 | + <div translate class="tb-hint"> | ||
| 43 | + admin.prohibit-different-url-hint | ||
| 44 | + </div> | ||
| 42 | <div layout="row" layout-align="end center" width="100%" layout-wrap> | 45 | <div layout="row" layout-align="end center" width="100%" layout-wrap> |
| 43 | <md-button ng-disabled="$root.loading || vm.settingsForm.$invalid || !vm.settingsForm.$dirty" type="submit" class="md-raised md-primary">{{'action.save' | translate}}</md-button> | 46 | <md-button ng-disabled="$root.loading || vm.settingsForm.$invalid || !vm.settingsForm.$dirty" type="submit" class="md-raised md-primary">{{'action.save' | translate}}</md-button> |
| 44 | </div> | 47 | </div> |
| @@ -74,7 +74,8 @@ | @@ -74,7 +74,8 @@ | ||
| 74 | "test-mail-sent": "Test mail was successfully sent!", | 74 | "test-mail-sent": "Test mail was successfully sent!", |
| 75 | "base-url": "Base URL", | 75 | "base-url": "Base URL", |
| 76 | "base-url-required": "Base URL is required.", | 76 | "base-url-required": "Base URL is required.", |
| 77 | - "prohibit-different-url": "Prohibit different URL", | 77 | + "prohibit-different-url": "Prohibit to use hostname from the client request headers", |
| 78 | + "prohibit-different-url-hint": "This setting should be enabled for production environments. May cause security issues when disabled", | ||
| 78 | "mail-from": "Mail From", | 79 | "mail-from": "Mail From", |
| 79 | "mail-from-required": "Mail From is required.", | 80 | "mail-from-required": "Mail From is required.", |
| 80 | "smtp-protocol": "SMTP protocol", | 81 | "smtp-protocol": "SMTP protocol", |