From 57ce60fdd8b8a595f40d75e43e376fc7985753be Mon Sep 17 00:00:00 2001 From: MaxKey Date: Fri, 10 Jul 2020 08:43:34 +0800 Subject: [PATCH] separate sdk & connectors separate sdk & connectors --- maxkey-authentications/build.gradle | 1 - maxkey-client-sdk/.classpath | 25 - maxkey-client-sdk/.gitignore | 1 - maxkey-client-sdk/.project | 40 - .../org.eclipse.buildship.core.prefs | 11 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 113 --- .../.settings/org.eclipse.jdt.launching.prefs | 2 - .../org.eclipse.wst.common.component | 7 - ....eclipse.wst.common.project.facet.core.xml | 7 - .../.sts4-cache/classpath-data.json | 1 - maxkey-client-sdk/build.gradle | 12 - .../org/maxkey/client/crypto/Base64Utils.java | 139 --- .../org/maxkey/client/crypto/BytesUtils.java | 29 - .../org/maxkey/client/crypto/HexUtils.java | 80 -- .../maxkey/client/crypto/ReciprocalUtils.java | 250 ------ .../maxkey/client/http/ApacheHttpClient.java | 106 --- .../client/http/AuthorizationHeader.java | 83 -- .../java/org/maxkey/client/http/HttpVerb.java | 26 - .../org/maxkey/client/http/Parameter.java | 71 -- .../org/maxkey/client/http/ParameterList.java | 122 --- .../java/org/maxkey/client/http/Request.java | 492 ----------- .../org/maxkey/client/http/RequestTuner.java | 23 - .../java/org/maxkey/client/http/Response.java | 149 ---- .../org/maxkey/client/http/RestClient.java | 142 ---- .../org/maxkey/client/http/SignatureType.java | 24 - .../org/maxkey/client/http/package-info.java | 25 - .../org/maxkey/client/ltpa/LtpaUtils.java | 79 -- .../org/maxkey/client/oauth/OAuthClient.java | 216 ----- .../client/oauth/builder/ServiceBuilder.java | 188 ----- .../maxkey/client/oauth/builder/api/Api.java | 43 - .../oauth/builder/api/DefaultApi20.java | 91 -- .../client/oauth/builder/api/MaxkeyApi20.java | 83 -- .../builder/api/MaxkeyPasswordApi20.java | 101 --- .../client/oauth/builder/api/OAuthApi20.java | 151 ---- .../client/oauth/domain/BaseDomain.java | 340 -------- .../client/oauth/domain/BaseEntity.java | 40 - .../client/oauth/domain/OIDCAddress.java | 71 -- .../client/oauth/domain/OIDCUserInfo.java | 251 ------ .../maxkey/client/oauth/domain/UserInfo.java | 792 ------------------ .../exceptions/OAuthConnectionException.java | 31 - .../oauth/exceptions/OAuthException.java | 50 -- .../OAuthParametersMissingException.java | 43 - .../exceptions/OAuthSignatureException.java | 41 - .../extractors/AccessTokenExtractor.java | 36 - .../oauth/extractors/BaseStringExtractor.java | 38 - .../extractors/BaseStringExtractorImpl.java | 68 -- .../extractors/GsonJsonTokenExtractor.java | 49 -- .../oauth/extractors/HeaderExtractor.java | 36 - .../oauth/extractors/HeaderExtractorImpl.java | 69 -- .../oauth/extractors/JsonTokenExtractor.java | 44 - .../oauth/extractors/QQTokenExtractor.java | 53 -- .../extractors/RequestTokenExtractor.java | 36 - .../extractors/TokenExtractor20Impl.java | 62 -- .../oauth/extractors/TokenExtractorImpl.java | 64 -- .../client/oauth/model/OAuthConfig.java | 109 --- .../client/oauth/model/OAuthConstants.java | 63 -- .../client/oauth/model/OAuthRequest.java | 94 --- .../org/maxkey/client/oauth/model/Token.java | 305 ------- .../maxkey/client/oauth/model/Verifier.java | 47 -- .../oauth/oauth/OAuth20ServiceImpl.java | 122 --- .../oauth/oauth/OAuthPasswordService.java | 87 -- .../client/oauth/oauth/OAuthService.java | 73 -- .../client/oauth/services/Base64Encoder.java | 53 -- .../client/oauth/services/CommonsEncoder.java | 59 -- .../services/DatatypeConverterEncoder.java | 35 - .../services/HMACSha1SignatureService.java | 79 -- .../services/PlaintextSignatureService.java | 59 -- .../services/RSASha1SignatureService.java | 70 -- .../oauth/services/SignatureService.java | 45 - .../oauth/services/TimestampService.java | 42 - .../oauth/services/TimestampServiceImpl.java | 85 -- .../java/org/maxkey/client/package-info.java | 25 - .../maxkey/client/tokenbase/TokenUtils.java | 69 -- .../org/maxkey/client/utils/JsonUtils.java | 66 -- .../org/maxkey/client/utils/MapUtils.java | 42 - .../org/maxkey/client/utils/PathUtils.java | 80 -- .../maxkey/client/utils/Preconditions.java | 93 -- .../org/maxkey/client/utils/StreamUtils.java | 66 -- .../maxkey/client/utils/StringGenerator.java | 156 ---- .../web/authn/AuthenticationFilter.java | 119 --- .../client/web/authn/SingleSignOutFilter.java | 65 -- .../src/main/resources/log4j.properties | 40 - .../client/utils/PathUtilsFile.properties | 1 - .../client/oauth/test/MaxKey20Example.java | 85 -- .../client/oauth/test/MaxkeyPasswordDemo.java | 53 -- .../client/oauth/test/package-info.java | 25 - .../java/org/maxkey/client/utils/URLTest.java | 44 - .../org/maxkey/client/utils/package-info.java | 25 - .../java/org/maxkey/rest/RestClientTest.java | 51 -- maxkey-connectors/.classpath | 6 - maxkey-connectors/.project | 28 - .../.classpath | 36 - .../maxkey-connector-activedirectory/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 14 - .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../org.eclipse.wst.common.component | 22 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../build.gradle | 17 - .../ActivedirectoryConsumerApplication.java | 73 -- .../Group2Activedirectory.java | 198 ----- .../Organization2Activedirectory.java | 141 ---- .../Password2Activedirectory.java | 103 --- .../UserInfo2Activedirectory.java | 288 ------- .../src/main/resources/application.properties | 48 -- .../maxkey-connector-base/.classpath | 36 - .../maxkey-connector-base/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 14 - .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../org.eclipse.wst.common.component | 19 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../maxkey-connector-base/build.gradle | 16 - .../maxkey/connector/AbstractConnector.java | 70 -- .../org/maxkey/connector/GroupConnector.java | 50 -- .../connector/OrganizationConnector.java | 39 - .../maxkey/connector/PasswordConnector.java | 30 - .../maxkey/connector/UserInfoConnector.java | 40 - .../receiver/KafkaGroupsTopicReceiver.java | 72 -- .../receiver/KafkaOrgsTopicReceiver.java | 72 -- .../receiver/KafkaPasswordTopicReceiver.java | 67 -- .../receiver/KafkaUserInfoTopicReceiver.java | 72 -- .../maxkey-connector-dingding/.classpath | 36 - .../maxkey-connector-dingding/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.wst.common.component | 22 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../maxkey-connector-dingding/build.gradle | 17 - .../DingdingConsumerApplication.java | 72 -- .../connector/dingding/Group2Dingding.java | 170 ---- .../dingding/Organization2Dingding.java | 136 --- .../connector/dingding/Password2Dingding.java | 62 -- .../connector/dingding/UserInfo2Dingding.java | 157 ---- .../src/main/resources/application.properties | 47 -- .../maxkey-connector-feishu/.classpath | 36 - .../maxkey-connector-feishu/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.wst.common.component | 22 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../maxkey-connector-feishu/build.gradle | 17 - .../connector/FeishuConsumerApplication.java | 72 -- .../maxkey/connector/feishu/Group2Feishu.java | 170 ---- .../connector/feishu/Organization2Feishu.java | 136 --- .../connector/feishu/Password2Feishu.java | 62 -- .../connector/feishu/UserInfo2Feishu.java | 157 ---- .../src/main/resources/application.properties | 47 -- .../maxkey-connector-ldap/.classpath | 36 - .../maxkey-connector-ldap/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 14 - .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../org.eclipse.wst.common.component | 22 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../maxkey-connector-ldap/build.gradle | 17 - .../connector/LdapConsumerApplication.java | 72 -- .../org/maxkey/connector/ldap/Group2Ldap.java | 170 ---- .../connector/ldap/Organization2Ldap.java | 136 --- .../maxkey/connector/ldap/Password2Ldap.java | 62 -- .../maxkey/connector/ldap/UserInfo2Ldap.java | 157 ---- .../src/main/resources/application.properties | 47 -- .../maxkey-connector-welink/.classpath | 36 - .../maxkey-connector-welink/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.wst.common.component | 22 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../maxkey-connector-welink/build.gradle | 17 - .../connector/WelinkConsumerApplication.java | 72 -- .../maxkey/connector/welink/Group2Welink.java | 170 ---- .../connector/welink/Organization2Welink.java | 136 --- .../connector/welink/Password2Welink.java | 62 -- .../connector/welink/UserInfo2Welink.java | 157 ---- .../src/main/resources/application.properties | 47 -- .../maxkey-connector-workweixin/.classpath | 36 - .../maxkey-connector-workweixin/.project | 41 - .../org.eclipse.buildship.core.prefs | 2 - .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.wst.common.component | 22 - ....eclipse.wst.common.project.facet.core.xml | 6 - .../org.springframework.ide.eclipse.prefs | 2 - .../maxkey-connector-workweixin/build.gradle | 17 - .../connector/WeixinConsumerApplication.java | 72 -- .../connector/workweixin/Group2Weixin.java | 170 ---- .../workweixin/Organization2Weixin.java | 136 --- .../connector/workweixin/Password2Weixin.java | 62 -- .../connector/workweixin/UserInfo2Weixin.java | 157 ---- .../src/main/resources/application.properties | 47 -- .../java/org/maxkey/util}/HttpEncoder.java | 11 +- .../java/org/maxkey/util}/HttpsTrusts.java | 2 +- .../org.eclipse.wst.common.component | 3 - .../maxkey-identity-rest/build.gradle | 1 - .../org.eclipse.wst.common.component | 3 - .../maxkey-identity-scim/build.gradle | 1 - .../maxkey-client-sdk-2.0.0.RELEASE.jar | Bin 0 -> 99193 bytes .../maxkey-protocol-authorize/build.gradle | 1 - .../maxkey-protocol-cas/build.gradle | 1 - .../maxkey-protocol-desktop/build.gradle | 1 - .../maxkey-protocol-extendapi/build.gradle | 1 - .../ExtendApiQQExmailDefaultAdapter.java | 2 +- .../maxkey-protocol-formbased/build.gradle | 1 - .../maxkey-protocol-oauth-2.0/build.gradle | 1 - .../endpoint/AuthorizationEndpoint.java | 20 +- .../maxkey-protocol-tokenbased/build.gradle | 1 - maxkey-web-manage/.project | 1 - maxkey-web-manage/build.gradle | 1 - maxkey-web-maxkey/.project | 1 - maxkey-web-maxkey/build.gradle | 1 - settings.gradle | 17 - 220 files changed, 17 insertions(+), 13295 deletions(-) delete mode 100644 maxkey-client-sdk/.classpath delete mode 100644 maxkey-client-sdk/.gitignore delete mode 100644 maxkey-client-sdk/.project delete mode 100644 maxkey-client-sdk/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-client-sdk/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-client-sdk/.settings/org.eclipse.jdt.core.prefs delete mode 100644 maxkey-client-sdk/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 maxkey-client-sdk/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-client-sdk/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-client-sdk/.sts4-cache/classpath-data.json delete mode 100644 maxkey-client-sdk/build.gradle delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/Base64Utils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/BytesUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/HexUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/ReciprocalUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/ApacheHttpClient.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/AuthorizationHeader.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/HttpVerb.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/Parameter.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/ParameterList.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/Request.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/RequestTuner.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/Response.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/RestClient.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/SignatureType.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/http/package-info.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/ltpa/LtpaUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/OAuthClient.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/ServiceBuilder.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/Api.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/DefaultApi20.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/OAuthApi20.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseDomain.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseEntity.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCAddress.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCUserInfo.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/UserInfo.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthConnectionException.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthException.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthParametersMissingException.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthSignatureException.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/AccessTokenExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractorImpl.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/GsonJsonTokenExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractorImpl.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/JsonTokenExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/QQTokenExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/RequestTokenExtractor.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractor20Impl.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractorImpl.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConfig.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConstants.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthRequest.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Token.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Verifier.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/Base64Encoder.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/CommonsEncoder.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/DatatypeConverterEncoder.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/HMACSha1SignatureService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/PlaintextSignatureService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/RSASha1SignatureService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/SignatureService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampService.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampServiceImpl.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/tokenbase/TokenUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/utils/JsonUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/utils/MapUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/utils/PathUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/utils/Preconditions.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StreamUtils.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StringGenerator.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java delete mode 100644 maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/SingleSignOutFilter.java delete mode 100644 maxkey-client-sdk/src/main/resources/log4j.properties delete mode 100644 maxkey-client-sdk/src/main/resources/org/maxkey/client/utils/PathUtilsFile.properties delete mode 100644 maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxKey20Example.java delete mode 100644 maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxkeyPasswordDemo.java delete mode 100644 maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/package-info.java delete mode 100644 maxkey-client-sdk/src/test/java/org/maxkey/client/utils/URLTest.java delete mode 100644 maxkey-client-sdk/src/test/java/org/maxkey/client/utils/package-info.java delete mode 100644 maxkey-client-sdk/src/test/java/org/maxkey/rest/RestClientTest.java delete mode 100644 maxkey-connectors/.classpath delete mode 100644 maxkey-connectors/.project delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.project delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/ActivedirectoryConsumerApplication.java delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Group2Activedirectory.java delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Organization2Activedirectory.java delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Password2Activedirectory.java delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/UserInfo2Activedirectory.java delete mode 100644 maxkey-connectors/maxkey-connector-activedirectory/src/main/resources/application.properties delete mode 100644 maxkey-connectors/maxkey-connector-base/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-base/.project delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-base/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-base/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/AbstractConnector.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/GroupConnector.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/OrganizationConnector.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/PasswordConnector.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/UserInfoConnector.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaGroupsTopicReceiver.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaOrgsTopicReceiver.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaPasswordTopicReceiver.java delete mode 100644 maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaUserInfoTopicReceiver.java delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.project delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-dingding/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-dingding/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/DingdingConsumerApplication.java delete mode 100644 maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Group2Dingding.java delete mode 100644 maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Organization2Dingding.java delete mode 100644 maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Password2Dingding.java delete mode 100644 maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/UserInfo2Dingding.java delete mode 100644 maxkey-connectors/maxkey-connector-dingding/src/main/resources/application.properties delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.project delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-feishu/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-feishu/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/FeishuConsumerApplication.java delete mode 100644 maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Group2Feishu.java delete mode 100644 maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Organization2Feishu.java delete mode 100644 maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Password2Feishu.java delete mode 100644 maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/UserInfo2Feishu.java delete mode 100644 maxkey-connectors/maxkey-connector-feishu/src/main/resources/application.properties delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.project delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-ldap/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-ldap/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/LdapConsumerApplication.java delete mode 100644 maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Group2Ldap.java delete mode 100644 maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Organization2Ldap.java delete mode 100644 maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Password2Ldap.java delete mode 100644 maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/UserInfo2Ldap.java delete mode 100644 maxkey-connectors/maxkey-connector-ldap/src/main/resources/application.properties delete mode 100644 maxkey-connectors/maxkey-connector-welink/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-welink/.project delete mode 100644 maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-welink/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-welink/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/WelinkConsumerApplication.java delete mode 100644 maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Group2Welink.java delete mode 100644 maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Organization2Welink.java delete mode 100644 maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Password2Welink.java delete mode 100644 maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/UserInfo2Welink.java delete mode 100644 maxkey-connectors/maxkey-connector-welink/src/main/resources/application.properties delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.classpath delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.project delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/.settings/org.springframework.ide.eclipse.prefs delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/build.gradle delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/WeixinConsumerApplication.java delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Group2Weixin.java delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Organization2Weixin.java delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Password2Weixin.java delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/UserInfo2Weixin.java delete mode 100644 maxkey-connectors/maxkey-connector-workweixin/src/main/resources/application.properties rename {maxkey-client-sdk/src/main/java/org/maxkey/client/utils => maxkey-core/src/main/java/org/maxkey/util}/HttpEncoder.java (82%) rename {maxkey-client-sdk/src/main/java/org/maxkey/client/utils => maxkey-core/src/main/java/org/maxkey/util}/HttpsTrusts.java (98%) create mode 100644 maxkey-lib/maxkey-client-sdk-2.0.0.RELEASE.jar diff --git a/maxkey-authentications/build.gradle b/maxkey-authentications/build.gradle index db007659e..a3a0ad5c4 100644 --- a/maxkey-authentications/build.gradle +++ b/maxkey-authentications/build.gradle @@ -10,7 +10,6 @@ dependencies { compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") diff --git a/maxkey-client-sdk/.classpath b/maxkey-client-sdk/.classpath deleted file mode 100644 index 319c4a47c..000000000 --- a/maxkey-client-sdk/.classpath +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-client-sdk/.gitignore b/maxkey-client-sdk/.gitignore deleted file mode 100644 index 84c048a73..000000000 --- a/maxkey-client-sdk/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build/ diff --git a/maxkey-client-sdk/.project b/maxkey-client-sdk/.project deleted file mode 100644 index ef7f802bf..000000000 --- a/maxkey-client-sdk/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - maxkey-client-sdk - maxkey-client-sdk - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - - diff --git a/maxkey-client-sdk/.settings/org.eclipse.buildship.core.prefs b/maxkey-client-sdk/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 216bf8377..000000000 --- a/maxkey-client-sdk/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -build.commands=org.eclipse.jdt.core.javabuilder -connection.arguments= -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.java.home=null -connection.jvm.arguments= -connection.project.dir=.. -containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/ -derived.resources=.gradle,build -eclipse.preferences.version=1 -natures=org.eclipse.jdt.core.javanature -project.path=\:maxkey-client-sdk diff --git a/maxkey-client-sdk/.settings/org.eclipse.core.resources.prefs b/maxkey-client-sdk/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-client-sdk/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-client-sdk/.settings/org.eclipse.jdt.core.prefs b/maxkey-client-sdk/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 4248c7fd6..000000000 --- a/maxkey-client-sdk/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,113 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=warning -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/maxkey-client-sdk/.settings/org.eclipse.jdt.launching.prefs b/maxkey-client-sdk/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index d211d3263..000000000 --- a/maxkey-client-sdk/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/maxkey-client-sdk/.settings/org.eclipse.wst.common.component b/maxkey-client-sdk/.settings/org.eclipse.wst.common.component deleted file mode 100644 index ac100e060..000000000 --- a/maxkey-client-sdk/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/maxkey-client-sdk/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-client-sdk/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index fd0227a68..000000000 --- a/maxkey-client-sdk/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/maxkey-client-sdk/.sts4-cache/classpath-data.json b/maxkey-client-sdk/.sts4-cache/classpath-data.json deleted file mode 100644 index 8d521ed76..000000000 --- a/maxkey-client-sdk/.sts4-cache/classpath-data.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"maxkey-client-sdk","classpathEntries":[{"kind":"binary","path":"C:\\Program Files\\Java\\jre1.8.0_221\\lib\\resources.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jre1.8.0_221\\lib\\rt.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jre1.8.0_221\\lib\\jsse.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jre1.8.0_221\\lib\\jce.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jre1.8.0_221\\lib\\charsets.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jre1.8.0_221\\lib\\jfr.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-beanutils\\commons-beanutils\\1.9.3\\c845703de334ddc6b4b3cd26835458cb1cba1f3d\\commons-beanutils-1.9.3.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-codec\\commons-codec\\1.12\\47a28ef1ed31eb182b44e15d49300dee5fadcf6a\\commons-codec-1.12.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-collections\\commons-collections\\3.2.2\\8ad72fe39fa8c91eaaf12aadb21e0c3661fe26d5\\commons-collections-3.2.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-csv\\1.7\\cb5d05520f8fe1b409aaf29962e47dc5764f8f39\\commons-csv-1.7.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-dbcp2\\2.6.0\\78d0e99c4bc815a9f20cf6837761e91b7fc6eef4\\commons-dbcp2-2.6.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-dbutils\\commons-dbutils\\1.7\\a2d6e515aa87e5d38f6b3003e70b13c1b1f19ca0\\commons-dbutils-1.7.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-digester3\\3.2\\c3f68c5ff25ec5204470fd8fdf4cb8feff5e8a79\\commons-digester3-3.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-digester\\commons-digester\\2.1\\73a8001e7a54a255eef0f03521ec1805dc738ca0\\commons-digester-2.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-io\\commons-io\\2.6\\815893df5f31da2ece4040fe0a12fd44b577afaf\\commons-io-2.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-lang\\commons-lang\\2.6\\ce1edb914c94ebc388f086c6827e8bdeec71ac2\\commons-lang-2.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-lang3\\3.9\\122c7cee69b53ed4a7681c03d4ee4c0e2765da5\\commons-lang3-3.9.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\commons-logging\\commons-logging\\1.2\\commons-logging-1.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-pool2\\2.6.2\\775a8072995b29eafe8fb0a828a190589f71cede\\commons-pool2-2.6.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-httpclient\\commons-httpclient\\3.1\\964cd74171f427720480efdec40a7c7f6e58426a\\commons-httpclient-3.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\commons-fileupload\\commons-fileupload\\1.4\\f95188e3d372e20e7328706c37ef366e5d7859b0\\commons-fileupload-1.4.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\commons-email\\1.5\\e8e677c6362eba14ff3c476ba63ccb83132dbd52\\commons-email-1.5.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\httpclient\\4.5.6\\1afe5621985efe90a92d0fbc9be86271efbe796f\\httpclient-4.5.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\fluent-hc\\4.5.6\\7f4b2ccd83078e3bb87c8ad280ec074c04c7e4a4\\fluent-hc-4.5.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\httpclient-cache\\4.5.6\\4238cd34156021eaadc7e4d2d5c47b835e1fed3c\\httpclient-cache-4.5.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\httpmime\\4.5.6\\164343da11db817e81e24e0d9869527e069850c9\\httpmime-4.5.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.httpcomponents\\httpcore\\4.4.10\\acc54d9b28bdffe4bbde89ed2e4a1e86b5285e2b\\httpcore-4.4.10.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.velocity\\velocity\\1.7\\2ceb567b8f3f21118ecdec129fe1271dbc09aa7a\\velocity-1.7.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\velocity\\velocity-dep\\1.4\\b1df5193d3dd66a310b32828c547cd9e163b98df\\velocity-dep-1.4.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.freemarker\\freemarker\\2.3.29\\46005eeee02e4458520c85d0bcf5001467b053c3\\freemarker-2.3.29.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.commons\\not-yet-commons-ssl\\0.3.9\\7548f1f49b8a0b808b8715ead7b3cb2d395b0909\\not-yet-commons-ssl-0.3.9.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-1.2-api\\2.12.0\\29474790d2292384eac2ecf1b3280f095b6ac3f1\\log4j-1.2-api-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-api\\2.12.0\\8b50b487ac0c0bff1af79d56c6454ea68f40c150\\log4j-api-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-core\\2.12.0\\1723837573e4c5dbc8840f9f6e8f79b245b94bb\\log4j-core-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-jcl\\2.12.0\\c6b6cc2594e6481d1a8cf5762ed67bcab004363e\\log4j-jcl-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-jul\\2.12.0\\d50c2eb436de7128393c1fa1b71596c12462eb88\\log4j-jul-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-slf4j-impl\\2.12.0\\7f44f5201f79d6f7010a1515699a5f6c40e49cb\\log4j-slf4j-impl-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.logging.log4j\\log4j-web\\2.12.0\\93c550519d057e56c75ba5074ea4a258d1732b8b\\log4j-web-2.12.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\org\\slf4j\\slf4j-api\\1.7.26\\slf4j-api-1.7.26.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.jboss.logging\\jboss-logging\\3.4.0.Final\\b225692a59f7dc3a789d2c85edc06041914e97e7\\jboss-logging-3.4.0.Final.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-aop\\5.2.2.RELEASE\\899739cf7f338f6297aa9eb25ea8b16338fe4e6d\\spring-aop-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-aspects\\5.2.2.RELEASE\\a7fc38ee5fcc7efff607cc93b5fa7259c0fbb4da\\spring-aspects-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-beans\\5.2.2.RELEASE\\81e4d9cc2e8fac88ab4eb7325c4521bd07c6389c\\spring-beans-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-core\\5.2.2.RELEASE\\bfcf2f6d0494d89db63ae170b8491223c93a88dc\\spring-core-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-context\\5.2.2.RELEASE\\a77a18fa425eba9c55447fa0711e2dbfbf71907b\\spring-context-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-context-indexer\\5.2.2.RELEASE\\f31f4b86f2a4c973834848917774f12c3d108b8a\\spring-context-indexer-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-context-support\\5.2.2.RELEASE\\f09e0177737a5be5c6b6315363bfff722e3524cb\\spring-context-support-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-expression\\5.2.2.RELEASE\\eb93bc4d4eb8e0bee60ea910e0fd615869336643\\spring-expression-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-instrument\\5.2.2.RELEASE\\73de68c900985304ef13ee3c4d313facf7fbf883\\spring-instrument-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-jcl\\5.2.2.RELEASE\\35efd564bf664c0bf53bd336b583391a7f872da7\\spring-jcl-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-jdbc\\5.2.2.RELEASE\\6f0070f04c60f77d0048dc5521f8aafd5a86e87e\\spring-jdbc-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-jms\\5.2.2.RELEASE\\a275151b739a85c3ef9003338231a3798a72a870\\spring-jms-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-messaging\\5.2.2.RELEASE\\93e22c86e57017e3093347e31bdb162b928999c9\\spring-messaging-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-orm\\5.2.2.RELEASE\\1b17c9e69d92e54439a092d6943e956f80392f43\\spring-orm-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-oxm\\5.2.2.RELEASE\\6bfabf762138bffaf1799f9d27d37f0ee7896722\\spring-oxm-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-test\\5.2.2.RELEASE\\444e2f91f667558df1853b15915ac28b2185404c\\spring-test-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-tx\\5.2.2.RELEASE\\2af860baa0b094e13786613e15e1804edb7a5977\\spring-tx-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-web\\5.2.2.RELEASE\\d9b0a8079b7d604f134e3054127a7aeba65949a5\\spring-web-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-webflux\\5.2.2.RELEASE\\610c4889b4e5087e2103fcfae32144af0321d06d\\spring-webflux-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-webmvc\\5.2.2.RELEASE\\a0e9e88a296c09850f92318872f4dee9f62c8c13\\spring-webmvc-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework\\spring-websocket\\5.2.2.RELEASE\\f751c66b60482096f97f28e196de25aaabc39668\\spring-websocket-5.2.2.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.security\\spring-security-core\\5.2.1.RELEASE\\f1265ecdd4636a2038768c2ab9da4b79961a3465\\spring-security-core-5.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.security\\spring-security-web\\5.2.1.RELEASE\\9e43c2d8d2dffc60bfba8ac95a106d30e9593106\\spring-security-web-5.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.security\\spring-security-crypto\\5.2.1.RELEASE\\77d7c803ab3f91231254509e37c51ee72651e0d7\\spring-security-crypto-5.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot\\2.2.1.RELEASE\\3acb07ca9d6b968209a91aec6a7751f35bf22764\\spring-boot-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-starter\\2.2.1.RELEASE\\5a4d687e6ffec805ce6320af7ca0b18798638200\\spring-boot-starter-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-actuator\\2.2.1.RELEASE\\6f91f2e1f75b06388b65da9d3ae54164ad427922\\spring-boot-actuator-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-autoconfigure\\2.2.1.RELEASE\\1e45b519cc3b1de0b1ecee6eed6397c19ede95a2\\spring-boot-autoconfigure-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-starter-freemarker\\2.2.1.RELEASE\\351b315a712c46a7680d944e63782b014920b3e5\\spring-boot-starter-freemarker-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-starter-log4j2\\2.2.1.RELEASE\\e4365822acf8b4300dae309206f75e6d12b9ac90\\spring-boot-starter-log4j2-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-starter-web\\2.2.1.RELEASE\\689213aca6e25e2aa9b377e61273aa3d31f30f60\\spring-boot-starter-web-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-starter-tomcat\\2.2.1.RELEASE\\da314ec9026c230906ea9d1a1330f99bbe2d0fa8\\spring-boot-starter-tomcat-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.opensaml\\opensaml\\2.6.4\\de2c742b770bd58328fd05ebd9d9efc85f79d88c\\opensaml-2.6.4.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.opensaml\\openws\\1.5.4\\942bd987e5956fcdf1eaa56cde87112ea871d0e8\\openws-1.5.4.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.opensaml\\xmltooling\\1.4.4\\8cf44998d4b9cca5f9eeb47cc95d95cea9f86714\\xmltooling-1.4.4.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\cn.hutool\\hutool-core\\5.1.2\\8952c0cb43272ba2873be46193971825d4b9f7d9\\hutool-core-5.1.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\cn.hutool\\hutool-http\\5.1.2\\9f43596260cd0b8212a12f96051b1fa04ec0c5de\\hutool-http-5.1.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.javassist\\javassist\\3.23.0-GA\\5c71cd6815cc207379639aca8c88478b7e959e35\\javassist-3.23.0-GA.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.owasp.esapi\\esapi\\2.2.0.0\\721cbbf80e2bf1cc3d87d4a791e4c7bc827fca95\\esapi-2.2.0.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.sun.mail\\javax.mail\\1.6.2\\935151eb71beff17a2ffac15dd80184a99a0514f\\javax.mail-1.6.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\taglibs\\standard\\1.1.2\\a17e8a4d9a1f7fcc5eed606721c9ed6b7f18acf7\\standard-1.1.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.servlet.jsp.jstl\\jstl\\1.2\\7a93a178d5599db1321a9e5ff927b4ed015b68d8\\jstl-1.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\javax\\activation\\activation\\1.1.1\\activation-1.1.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.annotation\\javax.annotation-api\\1.3.2\\934c04d3cfef185a8008e7bf34331b79730a9d43\\javax.annotation-api-1.3.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.transaction\\jta\\1.1\\2ca09f0b36ca7d71b762e14ea2ff09d5eac57558\\jta-1.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.transaction\\javax.transaction-api\\1.3\\e006adf5cf3cca2181d16bd640ecb80148ec0fce\\javax.transaction-api-1.3.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.validation\\validation-api\\2.0.1.Final\\cb855558e6271b1b32e716d24cb85c7f583ce09e\\validation-api-2.0.1.Final.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.xml\\jsr173\\1.0\\8b7a70786148944ef061fca58b5467d05dae07ba\\jsr173-1.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.xml.bind\\jaxb-api\\2.3.1\\8531ad5ac454cc2deb9d4d32c40c4d7451939b5d\\jaxb-api-2.3.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.sun.xml.bind\\jaxb-core\\2.3.0.1\\23574ca124d0a694721ce3ef13cd720095f18fdd\\jaxb-core-2.3.0.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.sun.xml.bind\\jaxb-impl\\2.3.2\\9d70d9b54cbc91b0e647d97af87395f39ea189f9\\jaxb-impl-2.3.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.sun.xml.bind\\jaxb-xjc\\2.3.2\\264a255681ebe9f9e955182c7922a34b5f7c4578\\jaxb-xjc-2.3.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.bouncycastle\\bcpkix-jdk15on\\1.60\\d0c46320fbc07be3a24eb13a56cee4e3d38e0c75\\bcpkix-jdk15on-1.60.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.bouncycastle\\bcprov-jdk15on\\1.60\\bd47ad3bd14b8e82595c7adaa143501e60842a84\\bcprov-jdk15on-1.60.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.bouncycastle\\bcprov-ext-jdk15on\\1.60\\faea4c950bbfa6e8882830f0266bc9185755d37\\bcprov-ext-jdk15on-1.60.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.google.crypto.tink\\tink\\1.2.2\\db27fd32f842b436ad07aecbe2934524473dc0ac\\tink-1.2.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.jhlabs\\filters\\2.0.235-1\\fff65ebe39d1097cee431087858b3caf957ecfb7\\filters-2.0.235-1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.github.penggle\\kaptcha\\2.3.2\\a3e13fd05bae905d67eafb40b712a1b624daef3b\\kaptcha-2.3.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.google.code.gson\\gson\\2.8.5\\f645ed69d595b24d4cf8b3fbb64cc505bede8829\\gson-2.8.5.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.codehaus.jackson\\jackson-all\\1.8.5\\a5549eaa90a63b20da244690f9ade851eaeb2d99\\jackson-all-1.8.5.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\com\\fasterxml\\jackson\\core\\jackson-databind\\2.9.9\\jackson-databind-2.9.9.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\com\\fasterxml\\jackson\\core\\jackson-core\\2.9.9\\jackson-core-2.9.9.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\com\\fasterxml\\jackson\\core\\jackson-annotations\\2.9.9\\jackson-annotations-2.9.9.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.fasterxml\\classmate\\1.5.0\\bc2d1d55f28e6dc0801d86cbd195debd81090d33\\classmate-1.5.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.alibaba\\fastjson\\1.2.62\\9243497a2f1f9d40d7d1d8d852f0abdc71955532\\fastjson-1.2.62.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.reactivestreams\\reactive-streams\\1.0.2\\323964c36556eb0e6209f65c1cef72b53b461ab8\\reactive-streams-1.0.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\io.projectreactor\\reactor-core\\3.2.10.RELEASE\\14b979abc580502c679d0b318814cef8b2066fce\\reactor-core-3.2.10.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\eu.tekul\\szxcvbn_2.9.2\\0.2\\cfac462aed38c7c0267a06993a3e3c2656807aae\\szxcvbn_2.9.2-0.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.quartz-scheduler\\quartz\\2.2.3\\d4d8ea088852beeb89f54d3040fe1cbaa8491dcd\\quartz-2.2.3.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\mysql\\mysql-connector-java\\5.1.48\\9140be77aafa5050bf4bb936d560cbacb5a6b5c1\\mysql-connector-java-5.1.48.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.alibaba\\druid\\1.1.21\\5b2a163e69c4afd223ca6f6f5ac440eec92c0249\\druid-1.1.21.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\redis.clients\\jedis\\3.0.1\\4e8f7e393f17e197b29f7b9481004ede8e154dcb\\jedis-3.0.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.ehcache\\ehcache\\3.5.3\\b81a3c3f1ba4feea2262d24f256fed501f2f4c48\\ehcache-3.5.3.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\org\\mybatis\\mybatis\\3.5.3\\mybatis-3.5.3.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.mybatis\\mybatis-spring\\2.0.3\\17472a85388c8d37c9ffefcc9ef0fc3edabcce02\\mybatis-spring-2.0.3.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.hibernate.validator\\hibernate-validator\\6.0.17.Final\\af73055fc4a103ab347c56e7da5a143d68a0170\\hibernate-validator-6.0.17.Final.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.hibernate.validator\\hibernate-validator-annotation-processor\\6.0.17.Final\\7e781852d08e29c11a7b35eea6fb534d7a453fd3\\hibernate-validator-annotation-processor-6.0.17.Final.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\net.jradius\\jradius-core\\1.1.5\\c216654b56044f331290628a2a3d40a0c5d50323\\jradius-core-1.1.5.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\net.jradius\\jradius-dictionary\\1.1.5\\a186921802d11779e3ee3adbe54636489dc1dfd3\\jradius-dictionary-1.1.5.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\joda-time\\joda-time\\2.10\\f66c8125d1057ffce6c4e29e624cac863e110e2b\\joda-time-2.10.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.yaml\\snakeyaml\\1.24\\13a9c0d6776483c3876e3ff9384f9bb55b17001b\\snakeyaml-1.24.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\net.sourceforge.nekohtml\\nekohtml\\1.9.22\\4f54af68ecb345f2453fb6884672ad08414154e3\\nekohtml-1.9.22.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.jdom\\jdom\\2.0.2\\d06c71e0df0ac4b94deb737718580ccce22d92e8\\jdom-2.0.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.google.zxing\\core\\3.4.0\\5264296c46634347890ec9250bc65f14b7362bf8\\core-3.4.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.google.guava\\guava\\27.1-jre\\e47b59c893079b87743cdcfb6f17ca95c08c592c\\guava-27.1-jre.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\ognl\\ognl\\3.2.9\\c582d2e2a7db6e57bfd169b6490cce64c7d245c0\\ognl-3.2.9.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\cglib\\cglib\\3.2.12\\16c0d1d8b5d50ea9ad38c1f6f9f1e35a42727bf0\\cglib-3.2.12.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\7.0\\d74d4ba0dee443f68fb2dcb7fcdb945a2cd89912\\asm-7.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.m2\\repository\\aopalliance\\aopalliance\\1.0\\aopalliance-1.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.aspectj\\aspectjtools\\1.9.4\\b907e51a8a6820926785b8933be3de4a021da90b\\aspectjtools-1.9.4.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\dom4j\\dom4j\\1.6.1\\5d3ccc056b6f056dbf0dddfdf43894b9065a8f94\\dom4j-1.6.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\xalan\\serializer\\2.7.2\\24247f3bb052ee068971393bdb83e04512bb1c3c\\serializer-2.7.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\xml-resolver\\xml-resolver\\1.2\\3d0f97750b3a03e0971831566067754ba4bfd68c\\xml-resolver-1.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.santuario\\xmlsec\\1.5.8\\d0b5e51f571069a86c9578ec15d6d7f9da8c0e76\\xmlsec-1.5.8.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.ogce\\xpp3\\1.1.6\\dc87e00ddb69341b46a3eb1c331c6fcebf6c8546\\xpp3-1.1.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.thoughtworks.xstream\\xstream\\1.4.10\\dfecae23647abc9d9fd0416629a4213a3882b101\\xstream-1.4.10.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\com.belerweb\\pinyin4j\\2.5.1\\ea23babfc45a078af5b73cd9f3401caad1f1b2a9\\pinyin4j-2.5.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.tomcat.embed\\tomcat-embed-core\\9.0.29\\207dc9ca4215853d96ed695862f9873001f02a4b\\tomcat-embed-core-9.0.29.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.apache.tomcat.embed\\tomcat-embed-logging-juli\\8.5.2\\eb8d86e9972274272133c73a976ea744d9086cf1\\tomcat-embed-logging-juli-8.5.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\junit\\junit\\4.11\\4e031bb61df09069aeb2bffb4019e7a5034a4ee0\\junit-4.11.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\javax.servlet\\javax.servlet-api\\3.0.1\\6bf0ebb7efd993e222fc1112377b5e92a13b38dd\\javax.servlet-api-3.0.1.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\me.zhyd.oauth\\JustAuth\\1.13.2\\27f2b1dbaf7ac21f6c3d448885d14696ef8d70be\\JustAuth-1.13.2.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.springframework.boot\\spring-boot-starter-test\\2.2.1.RELEASE\\fae935b40f7a6b7eac7f5daef51e83c2ca978211\\spring-boot-starter-test-2.2.1.RELEASE.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\xmlunit\\xmlunit\\1.6\\adcae0aff916681dacd2b490e193f1119cd964a9\\xmlunit-1.6.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\Administrator\\.gradle\\caches\\modules-2\\files-2.1\\org.mockito\\mockito-all\\1.10.19\\539df70269cc254a58cccc5d8e43286b4a73bf30\\mockito-all-1.10.19.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"D:\\JavaIDE\\Workspaces\\maxkey\\MaxKey\\maxkey-lib\\mybatis-jpa-extra-1.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"D:\\JavaIDE\\Workspaces\\maxkey\\MaxKey\\maxkey-lib\\mybatis-jpa-extra-2.1-api-1.0.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"source","path":"D:\\JavaIDE\\Workspaces\\maxkey\\MaxKey\\maxkey-client-sdk\\src\\main\\java","outputFolder":"D:\\JavaIDE\\Workspaces\\maxkey\\MaxKey\\maxkey-client-sdk\\bin\\main","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":true},{"kind":"source","path":"D:\\JavaIDE\\Workspaces\\maxkey\\MaxKey\\maxkey-client-sdk\\src\\test\\java","outputFolder":"D:\\JavaIDE\\Workspaces\\maxkey\\MaxKey\\maxkey-client-sdk\\bin\\test","isSystem":false,"isOwn":true,"isTest":true,"isJavaContent":true}]} \ No newline at end of file diff --git a/maxkey-client-sdk/build.gradle b/maxkey-client-sdk/build.gradle deleted file mode 100644 index 294a6fab2..000000000 --- a/maxkey-client-sdk/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -description = "maxkey-client-sdk" - -dependencies { - /*compile group: 'commons-io', name: 'commons-io', version: '2.6' - compile group: 'commons-logging', name: 'commons-logging', version: '1.2' - compile group: 'log4j', name: 'log4j', version: '1.2.17' - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.5.11' - compile group: 'commons-codec', name: 'commons-codec', version: '1.14' - compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '8.10' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' - */ -} \ No newline at end of file diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/Base64Utils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/Base64Utils.java deleted file mode 100644 index 50f64364f..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/Base64Utils.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.crypto; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; - -import org.apache.commons.codec.binary.Base64; - - -/** - * Base64 Utils - * - * @author Crystal.Sea - * - */ -public final class Base64Utils { - - - - public static String encodeBase64(byte[] simple){ - String cipher=BytesUtils.bytes2String(Base64.encodeBase64(simple)); - return cipher; - } - - public static byte[] decoderBase64(String cipher){ - byte[] simple=Base64.decodeBase64(cipher); - return simple; - } - - public static String encode(String simple){ - return encodeBase64(simple.getBytes()); - } - - public static String encoder(byte[] simple){ - return encodeBase64(simple); - } - - public static String decode(String cipher){ - return BytesUtils.bytes2String(decoderBase64(cipher)); - } - - public static byte[] decoder(String cipher){ - return decoderBase64(cipher); - } - - - /** - *encode file to base64 Code String - * @param fileName file path - * @return * - * @throws Exception - */ - - public static String fileToBase64(String fileName) throws Exception { - File file = new File(fileName);; - FileInputStream inputFile = new FileInputStream(file); - byte[] buffer = new byte[(int) file.length()]; - inputFile.read(buffer); - inputFile.close(); - return encodeBase64(buffer); - - } - - /** - * base64 Code decode String save to targetPath - * @param base64Code - * @param targetPath - * @throws Exception - */ - - public static void decodeBase64ToFile(String base64Code, String targetPath) - throws Exception { - byte[] buffer = decoderBase64(base64Code); - FileOutputStream out = new FileOutputStream(targetPath); - out.write(buffer); - out.close(); - - } - - /** - * base64 code save to file - * @param base64Code - * @param targetPath - * @throws Exception - */ - - public static void base64ToFile(String base64Code, String targetPath) - throws Exception { - byte[] buffer = base64Code.getBytes(); - FileOutputStream out = new FileOutputStream(targetPath); - out.write(buffer); - out.close(); - } - - public static String base64UrlEncode(byte[] simple) { - String s = new String(Base64.encodeBase64(simple)); // Regular base64 - // encoder - s = s.split("=")[0]; // Remove any trailing '='s - s = s.replace('+', '-'); // 62nd char of encoding - s = s.replace('/', '_'); // 63rd char of encoding - return s; - } - - public static byte[] base64UrlDecode(String cipher) { - String s = cipher; - s = s.replace('-', '+'); // 62nd char of encoding - s = s.replace('_', '/'); // 63rd char of encoding - switch (s.length() % 4) { // Pad with trailing '='s - case 0: - break; // No pad chars in this case - case 2: - s += "=="; - break; // Two pad chars - case 3: - s += "="; - break; // One pad char - default: - System.err.println("Illegal base64url String!"); - } - return Base64.decodeBase64(s); // Standard base64 decoder - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/BytesUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/BytesUtils.java deleted file mode 100644 index dec637e6b..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/BytesUtils.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.crypto; - -public final class BytesUtils { - - public static String bytes2String(byte[] bytesArray) { - String result = ""; - for (Byte bts : bytesArray) { - result += (char) bts.intValue(); - } - return result; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/HexUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/HexUtils.java deleted file mode 100644 index 02b8baf29..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/HexUtils.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -package org.maxkey.client.crypto; - -import java.io.UnsupportedEncodingException; - -/** - * @author Crystal.Sea - * - */ -public final class HexUtils { - - static final byte[] HEX_CHAR_TABLE = { - (byte) '0', (byte) '1',(byte) '2',(byte) '3', (byte) '4',(byte) '5', (byte) '6', (byte) '7', - (byte) '8', (byte) '9',(byte) 'a', (byte) 'b',(byte) 'c',(byte) 'd', (byte) 'e', (byte) 'f' - }; - - - public static String hex2String(byte[] b) { - String result = ""; - for (int i = 0; i < b.length; i++) { - result += Integer.toString((b[i] & 0xff) + 0x100, 16).substring(1); - } - return result; - } - - public static String bytes2HexString(byte[] raw) { - byte[] hex = new byte[2 * raw.length]; - int index = 0; - - for (byte b : raw) { - int v = b & 0xFF; - hex[index++] = HEX_CHAR_TABLE[v >>> 4]; - hex[index++] = HEX_CHAR_TABLE[v & 0xF]; - } - String s = ""; - try { - s = new String(hex, "ASCII"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return s; - } - - public static byte[] hex2Bytes(char[] hex) { - int length = hex.length / 2; - byte[] raw = new byte[length]; - for (int i = 0; i < length; i++) { - int high = Character.digit(hex[i * 2], 16); - int low = Character.digit(hex[i * 2 + 1], 16); - int value = (high << 4) | low; - if (value > 127) - value -= 256; - raw[i] = (byte) value; - } - return raw; - } - - public static byte[] hex2Bytes(String hex) { - return hex2Bytes(hex.toCharArray()); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/ReciprocalUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/ReciprocalUtils.java deleted file mode 100644 index 666226124..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/crypto/ReciprocalUtils.java +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -package org.maxkey.client.crypto; - -import java.io.UnsupportedEncodingException; -import java.security.SecureRandom; -import java.security.Security; - -import javax.crypto.Cipher; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; - -import org.apache.commons.logging.LogFactory; -import org.maxkey.client.utils.StringGenerator; - - -/** - * Reciprocal cipher or Symmetric-key algorithm - * - * algorithm Support DES,DESede,Blowfish and AES - * - * default key value use ReciprocalUtils.defaultKey - * - * generateKey is generate random key for algorithm - * - * @author Crystal.Sea - * - */ -public final class ReciprocalUtils { - - private static final String defaultKey= "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; // - - public final class Algorithm { - public static final String DES = "DES"; - public static final String DESede = "DESede"; - public static final String Blowfish = "Blowfish"; - public static final String AES = "AES"; - } - - public static byte[] encode(byte[] simpleBytes, SecretKey secretKey,String algorithm) { - // Create the ciphers - Cipher ecipher; - byte[] byteFinal = null; - try { - ecipher = Cipher.getInstance(secretKey.getAlgorithm()); - // Encode the string into bytes using utf-8 - ecipher.init(Cipher.ENCRYPT_MODE, secretKey); - // Encrypt - byteFinal = ecipher.doFinal(simpleBytes); - return byteFinal; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** - * @param simple - * @param secretKey - * must length - * @return - * @throws Exception - */ - public static byte[] encode(String simple, String secretKey,String algorithm) { - if (keyLengthCheck(secretKey, algorithm)) { - SecretKey key = generatorKey(secretKey, algorithm); - try { - return encode(simple.getBytes("UTF-8"), key, algorithm); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - } - return null; - } - - public static byte[] decoder(byte[] ciphersBytes, SecretKey secretKey,String algorithm) { - Cipher cipher; - byte[] byteFinal = null; - try { - cipher = Cipher.getInstance(algorithm); - cipher.init(Cipher.DECRYPT_MODE, secretKey); - byteFinal = cipher.doFinal(ciphersBytes); - // String simple=new String(byteFinal, "UTF8" ); - // return simple; - return byteFinal; - } catch (Exception e) { - e.printStackTrace(); - } finally { - cipher = null; - } - return null; - } - - public static String decoder(byte[] ciphersBytes, String secretKey,String algorithm) { - if (keyLengthCheck(secretKey, algorithm)) { - SecretKey key = generatorKey(secretKey, algorithm); - try { - return new String(decoder(ciphersBytes, key, algorithm), "UTF8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - } - return null; - } - - private static SecretKey generatorDefaultKey(String algorithm) { - try { - Security.addProvider(new com.sun.crypto.provider.SunJCE()); - KeyGenerator _generator = KeyGenerator.getInstance(algorithm); - _generator.init(new SecureRandom(defaultKey.getBytes())); - SecretKey key = _generator.generateKey(); - _generator = null; - return key; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - private static SecretKey generatorKey(String secretKey, String algorithm) { - try { - SecretKey key = new SecretKeySpec(secretKey.getBytes(), algorithm); - return key; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - - - private static boolean keyLengthCheck(String secretKey,String algorithm){ - boolean lengthCheck=false; - if(algorithm.equals(Algorithm.DES)){ - if(secretKey.length()==8){ - lengthCheck=true; - }else{ - LogFactory.getLog(ReciprocalUtils.class).debug("key length is "+secretKey.getBytes().length+" ,must lequal 8"); - } - }else if(algorithm.equals(Algorithm.DESede)){ - if(secretKey.length()==24){ - lengthCheck=true; - }else{ - LogFactory.getLog(ReciprocalUtils.class).debug("key length is "+secretKey.getBytes().length+" ,must equal 24"); - } - }else if(algorithm.equals(Algorithm.AES)){ - if(secretKey.length()==16){ - lengthCheck=true; - }else{ - LogFactory.getLog(ReciprocalUtils.class).debug("key length is "+secretKey.getBytes().length+" ,must equal 16"); - } - }else if(algorithm.equals(Algorithm.Blowfish)){ - if(secretKey.length()<= 16){ - lengthCheck=true; - }else{ - LogFactory.getLog(ReciprocalUtils.class).debug("key length is "+secretKey.getBytes().length+" ,must be less then 16"); - } - } - return lengthCheck; - } - - public static byte[] encodeByDefaultKey(String simple, String algorithm) { - SecretKey key = generatorDefaultKey(algorithm); - return encode(simple.getBytes(), key, algorithm); - - } - - public static String encode2HexByDefaultKey(String simple, String algorithm) { - byte[] byteFinal = encodeByDefaultKey(simple, algorithm); - - String cipherHex = HexUtils.bytes2HexString(byteFinal); - return cipherHex; - } - - public static byte[] decoderByDefaultKey(byte[] byteCiphers,String algorithm) { - SecretKey key = generatorDefaultKey(algorithm); - return decoder(byteCiphers, key, algorithm); - - } - - public static String decoderHexByDefaultKey(String ciphers, String algorithm) { - byte[] byteSimple = HexUtils.hex2Bytes(ciphers); - byte[] byteFinal = decoderByDefaultKey(byteSimple, algorithm); - - String simple = null; - try { - simple = new String(byteFinal, "UTF-8"); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return simple; - - } - - /** - * encode by defaultKey with Algorithm.AES - * - * @param simple - * @return Hex - */ - public static String encode(String simple) { - return encode2HexByDefaultKey(simple, Algorithm.AES); - } - - /** - * decoder by defaultKey with Algorithm.AES - * - * @param ciphers is HEX - * - * @return - */ - public static String decoder(String ciphers) { - return decoderHexByDefaultKey(ciphers, Algorithm.AES); - } - - public static String generateKey(String algorithm){ - if(algorithm.equals(Algorithm.DES)){ - return (new StringGenerator(8)).randomGenerate(); - }else if(algorithm.equals(Algorithm.AES)){ - return (new StringGenerator(16)).randomGenerate(); - }else if(algorithm.equals(Algorithm.Blowfish)){ - return (new StringGenerator(16)).randomGenerate(); - }else if(algorithm.equals(Algorithm.DESede)){ - return (new StringGenerator(24)).randomGenerate(); - }else{ - return (new StringGenerator()).uniqueGenerate(); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/ApacheHttpClient.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/ApacheHttpClient.java deleted file mode 100644 index 75bfe9751..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/ApacheHttpClient.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.maxkey.client.http; - -/* -public class ApacheHttpClient{ - - private final CloseableHttpAsyncClient client; - - public ApacheHttpClient() { - this(ApacheHttpClientConfig.defaultConfig()); - } - - public ApacheHttpClient(ApacheHttpClientConfig config) { - this(config.getHttpAsyncClientBuilder()); - } - - public ApacheHttpClient(HttpAsyncClientBuilder builder) { - this(builder.build()); - } - - public ApacheHttpClient(CloseableHttpAsyncClient client) { - this.client = client; - this.client.start(); - } - - @Override - public void close() throws IOException { - client.close(); - } - - @Override - public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl, - byte[] bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) { - final HttpEntity entity = bodyContents == null ? null : new ByteArrayEntity(bodyContents); - return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, entity, callback, converter); - } - - @Override - public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl, - MultipartPayload bodyContents, OAuthAsyncRequestCallback callback, - OAuthRequest.ResponseConverter converter) { - - throw new UnsupportedOperationException("ApacheHttpClient does not support MultipartPayload yet."); - } - - @Override - public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl, - String bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) { - final HttpEntity entity = bodyContents == null ? null : new StringEntity(bodyContents, StandardCharsets.UTF_8); - return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, entity, callback, converter); - } - - @Override - public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl, - File bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) { - final HttpEntity entity = bodyContents == null ? null : new FileEntity(bodyContents); - return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, entity, callback, converter); - } - - private Future doExecuteAsync(String userAgent, Map headers, Verb httpVerb, - String completeUrl, HttpEntity entity, OAuthAsyncRequestCallback callback, - OAuthRequest.ResponseConverter converter) { - final RequestBuilder builder = getRequestBuilder(httpVerb); - builder.setUri(completeUrl); - - if (httpVerb.isPermitBody()) { - if (!headers.containsKey(CONTENT_TYPE)) { - builder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE); - } - builder.setEntity(entity); - } - - for (Map.Entry header : headers.entrySet()) { - builder.addHeader(header.getKey(), header.getValue()); - } - - if (userAgent != null) { - builder.setHeader(OAuthConstants.USER_AGENT_HEADER_NAME, userAgent); - } - final OAuthAsyncCompletionHandler handler = new OAuthAsyncCompletionHandler<>(callback, converter); - final Future future = client.execute(builder.build(), handler); - return new ApacheHttpFuture<>(future, handler); - } - - private static RequestBuilder getRequestBuilder(Verb httpVerb) { - switch (httpVerb) { - case GET: - return RequestBuilder.get(); - case PUT: - return RequestBuilder.put(); - case DELETE: - return RequestBuilder.delete(); - case HEAD: - return RequestBuilder.head(); - case POST: - return RequestBuilder.post(); - case PATCH: - return RequestBuilder.patch(); - case TRACE: - return RequestBuilder.trace(); - case OPTIONS: - return RequestBuilder.options(); - default: - throw new IllegalArgumentException("message build error: unknown verb type"); - } - } -}*/ \ No newline at end of file diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/AuthorizationHeader.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/AuthorizationHeader.java deleted file mode 100644 index c7c71dd0b..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/AuthorizationHeader.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -import org.maxkey.client.crypto.Base64Utils; - - -/** - * @author Crystal.Sea - * - */ -public class AuthorizationHeader { - - public static String AUTHORIZATION_HEADERNAME="Authorization"; - - public static String BASIC="Basic "; - - public static String BEARER="Bearer "; - - public static String createBasic( String username, String password ){ - String authUserPass = username + ":" + password; - String encodedAuthUserPass = Base64Utils.encode(authUserPass ); - return BASIC + encodedAuthUserPass; - } - - public static String [] resolveBasic( String basic ){ - if(isBasic(basic)){ - String[] userPass =basic.split(" "); - String decodeUserPass = Base64Utils.decode(userPass[1] ); - return decodeUserPass.split(":"); - }else{ - return null; - } - } - - public static boolean isBasic( String basic ){ - if(basic.startsWith(BASIC )){ - return true; - }else{ - return false; - } - } - - public static String resolveBearer( String bearer ){ - if(isBearer(bearer)){ - return bearer.split(" ")[1]; - }else{ - return null; - } - } - - - public static String createBearer(String bearer){ - return BEARER +bearer; - } - - - - public static boolean isBearer( String bearer ){ - if(bearer.startsWith(BEARER )){ - return true; - }else{ - return false; - } - } - - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/HttpVerb.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/HttpVerb.java deleted file mode 100644 index 741f66ccc..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/HttpVerb.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -/** - * An enumeration containing the most common HTTP Verbs. - */ -public enum HttpVerb { - - GET, POST, PUT, DELETE, HEAD, OPTIONS, TRACE, PATCH -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Parameter.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Parameter.java deleted file mode 100644 index ec317840b..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Parameter.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -import org.maxkey.client.utils.HttpEncoder; - -public class Parameter implements Comparable { - - private final String key; - private final String value; - - public Parameter(String key, String value) { - this.key = key; - this.value = value; - } - - public String asUrlEncodedPair() { - return HttpEncoder.encode(key).concat("=").concat(HttpEncoder.encode(value)); - } - - @Override - public boolean equals(Object other) { - if (other == null) { - return false; - } - if (other == this) { - return true; - } - if (!(other instanceof Parameter)) { - return false; - } - - final Parameter otherParam = (Parameter) other; - return otherParam.getKey().equals(key) && otherParam.getValue().equals(value); - } - - public String getKey() { - return key; - } - - public String getValue() { - return value; - } - - @Override - public int hashCode() { - return key.hashCode() + value.hashCode(); - } - - @Override - public int compareTo(Parameter parameter) { - final int keyDiff = key.compareTo(parameter.getKey()); - - return keyDiff == 0 ? value.compareTo(parameter.getValue()) : keyDiff; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/ParameterList.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/ParameterList.java deleted file mode 100644 index 347890c3e..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/ParameterList.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -public class ParameterList { - - private static final char QUERY_STRING_SEPARATOR = '?'; - private static final String PARAM_SEPARATOR = "&"; - private static final String PAIR_SEPARATOR = "="; - private static final String EMPTY_STRING = ""; - - private final List params; - - public ParameterList() { - params = new ArrayList<>(); - } - - ParameterList(List params) { - this.params = new ArrayList<>(params); - } - - public ParameterList(Map map) { - this(); - if (map != null && !map.isEmpty()) { - for (Map.Entry entry : map.entrySet()) { - params.add(new Parameter(entry.getKey(), entry.getValue())); - } - } - } - - public void add(String key, String value) { - params.add(new Parameter(key, value)); - } - - public String appendTo(String url) { - Preconditions.checkNotNull(url, "Cannot append to null URL"); - final String queryString = asFormUrlEncodedString(); - if (queryString.equals(EMPTY_STRING)) { - return url; - } else { - return url - + (url.indexOf(QUERY_STRING_SEPARATOR) == -1 ? QUERY_STRING_SEPARATOR : PARAM_SEPARATOR) - + queryString; - } - } - - public String asOauthBaseString() { - return HttpEncoder.encode(asFormUrlEncodedString()); - } - - public String asFormUrlEncodedString() { - if (params.isEmpty()) { - return EMPTY_STRING; - } - - final StringBuilder builder = new StringBuilder(); - for (Parameter p : params) { - builder.append(PARAM_SEPARATOR).append(p.asUrlEncodedPair()); - } - return builder.substring(1); - } - - public void addAll(ParameterList other) { - params.addAll(other.getParams()); - } - - public void addQuerystring(String queryString) { - if (queryString != null && !queryString.isEmpty()) { - for (String param : queryString.split(PARAM_SEPARATOR)) { - try{ - final String[] pair = param.split(PAIR_SEPARATOR); - final String key = HttpEncoder.decode(pair[0]); - final String value = pair.length > 1 ? HttpEncoder.decode(pair[1]) : EMPTY_STRING; - params.add(new Parameter(key, value)); - }catch(Exception e){ - - } - } - } - } - - public boolean contains(Parameter param) { - return params.contains(param); - } - - public int size() { - return params.size(); - } - - public List getParams() { - return params; - } - - public ParameterList sort() { - final ParameterList sorted = new ParameterList(params); - Collections.sort(sorted.getParams()); - return sorted; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Request.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Request.java deleted file mode 100644 index d084cb0f5..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Request.java +++ /dev/null @@ -1,492 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -import java.io.*; -import java.net.*; -import java.nio.charset.*; -import java.util.*; -import java.util.concurrent.*; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.utils.HttpsTrusts; -import org.maxkey.client.utils.JsonUtils; - -/** - * Represents an HTTP Request object - * - */ -public class Request -{ - private static Log _log = LogFactory.getLog(Request. class ); - public static final String DEFAULT_CONTENT_TYPE = "application/x-www-form-urlencoded"; - private static final String CONTENT_LENGTH = "Content-Length"; - private static final String CONTENT_TYPE = "Content-Type"; - private static RequestTuner NOOP = new RequestTuner() { - @Override public void tune(Request request){} - }; - - - private String url; - private HttpVerb verb; - private ParameterList querystringParams; - private ParameterList bodyParams; - private Map headers; - private String payload = null; - private HttpURLConnection connection; - private String charset; - private byte[] bytePayload = null; - private boolean connectionKeepAlive = false; - private boolean followRedirects = true; - private Long connectTimeout = null; - private Long readTimeout = null; - private String realm; - /** - * Creates a new Http Request - * - * @param verb Http Verb (GET, POST, etc) - * @param url url with optional querystring parameters. - */ - public Request(HttpVerb verb, String url) - { - this.verb = verb; - this.url = url; - this.querystringParams = new ParameterList(); - this.bodyParams = new ParameterList(); - this.headers = new HashMap(); - } - - /** - * Execute the request and return a {@link Response} - * - * @return Http Response - * @throws RuntimeException - * if the connection cannot be created. - */ - public Response send(RequestTuner tuner) - { - try - { - createConnection(); - return doSend(tuner); - } - catch (Exception e) - { - throw new OAuthConnectionException(e); - } - } - - public Response send() - { - return send(NOOP); - } - - private void createConnection() throws IOException - { - String completeUrl = getCompleteUrl(); - _log.debug("verb method : "+verb); - _log.debug("completeUrl : "+completeUrl); - - if (connection == null) - { - System.setProperty("http.keepAlive", connectionKeepAlive ? "true" : "false"); - connection = (HttpURLConnection) new URL(completeUrl).openConnection(); - if(completeUrl.trim().startsWith("https")){ - HttpsTrusts.beforeConnection(); - } - - connection.setInstanceFollowRedirects(followRedirects); - } - } - - /** - * Returns the complete url (host + resource + encoded querystring parameters). - * - * @return the complete url. - */ - public String getCompleteUrl() - { - return querystringParams.appendTo(url); - } - - Response doSend(RequestTuner tuner) throws IOException - { - connection.setRequestMethod(this.verb.name()); - if (connectTimeout != null) - { - connection.setConnectTimeout(connectTimeout.intValue()); - } - if (readTimeout != null) - { - connection.setReadTimeout(readTimeout.intValue()); - } - addHeaders(connection); - if (verb.equals(HttpVerb.PUT) || verb.equals(HttpVerb.POST)) - { - addBody(connection, getByteBodyContents()); - } - tuner.tune(this); - return new Response(connection); - } - - void addHeaders(HttpURLConnection conn) - { - for (String key : headers.keySet()) - conn.setRequestProperty(key, headers.get(key)); - } - - void addBody(HttpURLConnection conn, byte[] content) throws IOException - { - conn.setRequestProperty(CONTENT_LENGTH, String.valueOf(content.length)); - - // Set default content type if none is set. - if (conn.getRequestProperty(CONTENT_TYPE) == null) - { - conn.setRequestProperty(CONTENT_TYPE, DEFAULT_CONTENT_TYPE); - } - conn.setDoOutput(true); - conn.getOutputStream().write(content); - } - - /** - * Add an HTTP Header to the Request - * - * @param key the header name - * @param value the header value - */ - public void addHeader(String key, String value) - { - this.headers.put(key, value); - } - - /** - * Add a body Parameter (for POST/ PUT Requests) - * - * @param key the parameter name - * @param value the parameter value - */ - public void addBodyParameter(String key, String value) - { - this.bodyParams.add(key, value); - } - - /** - * Add a QueryString parameter - * - * @param key the parameter name - * @param value the parameter value - */ - public void addQuerystringParameter(String key, String value) - { - this.querystringParams.add(key, value); - } - - public void addParameter(String key, String value) { - if (hasBodyContent()) { - bodyParams.add(key, value); - } else { - querystringParams.add(key, value); - } - } - - protected boolean hasBodyContent() { - return verb == HttpVerb.PUT || verb == HttpVerb.POST; - } - /** - * Add body payload. - * - * This method is used when the HTTP body is not a form-url-encoded string, - * but another thing. Like for example XML. - * - * Note: The contents are not part of the OAuth signature - * - * @param payload the body of the request - */ - public void addPayload(String payload) - { - this.payload = payload; - } - - /** - * Overloaded version for byte arrays - * - * @param payload - */ - public void addPayload(byte[] payload) - { - this.bytePayload = payload.clone(); - } - - /** - * set REST Content - * - * @param content - */ - public void addRestContent(String content) - { - this.payload = content; - } - - /** - * set REST Content - * - * @param content - */ - public void addRestObject(Object content) - { - try { - this.bytePayload = JsonUtils.gson2Json(content).getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - /** - * set REST Content - * - * @param content - */ - public void addRestContent(byte[] content) - { - this.bytePayload = content.clone(); - } - - /** - * Get a {@link ParameterList} with the query string parameters. - * - * @return a {@link ParameterList} containing the query string parameters. - * @throws OAuthException if the request URL is not valid. - */ - public ParameterList getQueryStringParams() - { - try - { - ParameterList result = new ParameterList(); - String queryString = new URL(url).getQuery(); - result.addQuerystring(queryString); - result.addAll(querystringParams); - return result; - } - catch (MalformedURLException mue) - { - throw new OAuthException("Malformed URL", mue); - } - } - - /** - * Obtains a {@link ParameterList} of the body parameters. - * - * @return a {@link ParameterList}containing the body parameters. - */ - public ParameterList getBodyParams() - { - return bodyParams; - } - - /** - * Obtains the URL of the HTTP Request. - * - * @return the original URL of the HTTP Request - */ - public String getUrl() - { - return url; - } - - /** - * Returns the URL without the port and the query string part. - * - * @return the OAuth-sanitized URL - - public String getSanitizedUrl() - { - return url.replaceAll("\\?.*", "").replace("\\:\\d{4}", ""); - } - */ - /** - * Returns the URL without the port and the query string part. - * - * @return the OAuth-sanitized URL - */ - public String getSanitizedUrl() { - if (url.startsWith("http://") && (url.endsWith(":80") || url.contains(":80/"))) { - return url.replaceAll("\\?.*", "").replaceAll(":80", ""); - } else if (url.startsWith("https://") && (url.endsWith(":443") || url.contains(":443/"))) { - return url.replaceAll("\\?.*", "").replaceAll(":443", ""); - } else { - return url.replaceAll("\\?.*", ""); - } - } - /** - * Returns the body of the request - * - * @return form encoded string - * @throws OAuthException if the charset chosen is not supported - */ - public String getBodyContents() - { - try - { - return new String(getByteBodyContents(),getCharset()); - } - catch(UnsupportedEncodingException uee) - { - throw new OAuthException("Unsupported Charset: "+charset, uee); - } - } - - byte[] getByteBodyContents() - { - if (bytePayload != null) return bytePayload; - String body = (payload != null) ? payload : bodyParams.asFormUrlEncodedString(); - - _log.debug("getByteBodyContents : "+body); - try - { - return body.getBytes(getCharset()); - } - catch(UnsupportedEncodingException uee) - { - throw new OAuthException("Unsupported Charset: "+getCharset(), uee); - } - } - - - /** - * Returns the HTTP Verb - * - * @return the verb - */ - public HttpVerb getVerb() - { - return verb; - } - - public void setRealm(String realm) { - this.realm = realm; - } - - public String getRealm() { - return realm; - } - - /** - * Returns the connection headers as a {@link Map} - * - * @return map of headers - */ - public Map getHeaders() - { - return headers; - } - - /** - * Returns the connection charset. Defaults to {@link Charset} defaultCharset if not set - * - * @return charset - */ - public String getCharset() - { - return charset == null ? Charset.defaultCharset().name() : charset; - } - - /** - * Sets the connect timeout for the underlying {@link HttpURLConnection} - * - * @param duration duration of the timeout - * - * @param unit unit of time (milliseconds, seconds, etc) - */ - public void setConnectTimeout(int duration, TimeUnit unit) - { - this.connectTimeout = unit.toMillis(duration); - } - - /** - * Sets the read timeout for the underlying {@link HttpURLConnection} - * - * @param duration duration of the timeout - * - * @param unit unit of time (milliseconds, seconds, etc) - */ - public void setReadTimeout(int duration, TimeUnit unit) - { - this.readTimeout = unit.toMillis(duration); - } - - /** - * Set the charset of the body of the request - * - * @param charsetName name of the charset of the request - */ - public void setCharset(String charsetName) - { - this.charset = charsetName; - } - - /** - * Sets whether the underlying Http Connection is persistent or not. - * - * @see http://download.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html - * @param connectionKeepAlive - */ - - @Deprecated - public void setConnectionKeepAlive(boolean connectionKeepAlive){ - this.connectionKeepAlive = connectionKeepAlive; - } - - /** - * - * @param connectionKeepAlive - * true or false - */ - public void setConnectionKeepAlive(String connectionKeepAlive){ - System.setProperty("http.keepAlive", connectionKeepAlive); - } - - /** - * Sets whether the underlying Http Connection follows redirects or not. - * - * Defaults to true (follow redirects) - * - * @see http://docs.oracle.com/javase/6/docs/api/java/net/HttpURLConnection.html#setInstanceFollowRedirects(boolean) - * @param followRedirects - */ - public void setFollowRedirects(boolean followRedirects) - { - this.followRedirects = followRedirects; - } - - /* - * We need this in order to stub the connection object for test cases - */ - void setConnection(HttpURLConnection connection) - { - this.connection = connection; - } - - @Override - public String toString() - { - return String.format("@Request(%s %s)", getVerb(), getUrl()); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/RequestTuner.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/RequestTuner.java deleted file mode 100644 index a95e3b884..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/RequestTuner.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -public abstract class RequestTuner -{ - public abstract void tune(Request request); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Response.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Response.java deleted file mode 100644 index e43de9311..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/Response.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -import java.io.*; -import java.net.*; -import java.util.*; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.utils.StreamUtils; - -/** - * Represents an HTTP Response. - * - * @author Pablo Fernandez - */ -public class Response { - - private int code; - private String message; - private String body; - private InputStream stream; - private Map headers; - - public Response(int code, String message, Map headers, String body, InputStream stream) { - this.code = code; - this.headers = headers; - this.body = body; - this.message = message; - this.stream = stream; - } - - Response(HttpURLConnection connection) throws IOException { - try { - connection.connect(); - code = connection.getResponseCode(); - message = connection.getResponseMessage(); - headers = parseHeaders(connection); - stream = isSuccessful() ? connection.getInputStream() : connection.getErrorStream(); - } catch (UnknownHostException e) { - throw new OAuthException("The IP address of a host could not be determined.", e); - } - } - - private String parseBodyContents() throws IOException { - if ("gzip".equals(getHeader("Content-Encoding"))) { - body = StreamUtils.getGzipStreamContents(getStream()); - } else { - body = StreamUtils.getStreamContents(getStream()); - } - return body; - } - - private Map parseHeaders(HttpURLConnection conn) { - final Map headers = new HashMap<>(); - for (String key : conn.getHeaderFields().keySet()) { - headers.put(key, conn.getHeaderFields().get(key).get(0)); - } - return headers; - } - - public final boolean isSuccessful() { - return getCode() >= 200 && getCode() < 400; - } - - public String getBody() { - try { - return body == null ? parseBodyContents() : body; - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return ""; - } - - /** - * Obtains the meaningful stream of the HttpUrlConnection, either inputStream or errorInputStream, depending on the - * status code - * - * @return input stream / error stream - */ - public InputStream getStream() { - return stream; - } - - /** - * Obtains the HTTP status code - * - * @return the status code - */ - public final int getCode() { - return code; - } - - /** - * Obtains the HTTP status message. Returns null if the message can not be discerned from the response - * (not valid HTTP) - * - * @return the status message - */ - public String getMessage() { - return message; - } - - /** - * Obtains a {@link Map} containing the HTTP Response Headers - * - * @return headers - */ - public Map getHeaders() { - return headers; - } - - /** - * Obtains a single HTTP Header value, or null if undefined - * - * @param name the header name. - * - * @return header value or null. - */ - public String getHeader(String name) { - return headers.get(name); - } - - @Override - public String toString() { - return "Response{" + - "code=" + code + - ", message='" + message + '\'' + - ", body='" + body + '\'' + - ", headers=" + headers + - '}'; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/RestClient.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/RestClient.java deleted file mode 100644 index 1fdc638f0..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/RestClient.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.maxkey.client.http.AuthorizationHeader; -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Response; -import org.maxkey.client.utils.Preconditions; - - -public class RestClient { - - private static Log _log = LogFactory.getLog(RestClient. class ); - - //action method - private HttpVerb method = HttpVerb.GET; - - //request Service - private Request request; - - - public RestClient(String url) { - Preconditions.checkEmptyString(url, "Invalid request url"); - - request = new Request(method, url); - } - - - /** - * 鏋勯�犳柟娉� - * - * @param method 璇锋眰鏂规硶 - * @param url 璇锋眰url - */ - public RestClient(String url,HttpVerb method) { - Preconditions.checkEmptyString(url, "Invalid request url"); - if(method != null) { - this.method = method; - } - request = new Request(method, url); - } - - - /** - * 娣诲姞璇锋眰鍙傛暟 - * - * @param name 鍙傛暟鍚� - * @param value 鍙傛暟鍊� - */ - public void addParameter(String name,String value) { - Preconditions.checkEmptyString(name, "parameter name is null"); - Preconditions.checkNotNull(request, "RestClient is null"); - if(HttpVerb.GET == method) { - request.addQuerystringParameter(name, value); - } else if(HttpVerb.POST == method) { - request.addBodyParameter(name, value); - } - } - - /** - * 娣诲姞璇锋眰Header - * - * @param name 鍙傛暟鍚� - * @param value 鍙傛暟鍊� - */ - public void addHeader(String name,String value) { - Preconditions.checkEmptyString(name, "parameter name is null"); - Preconditions.checkNotNull(request, "OAuthRequest is null"); - request.addHeader(name, value); - } - - /** - * 鍙戦�佽姹傦紝鑾峰彇杩斿洖鐨勬暟鎹� - * - * @return Response 鏈嶅姟绔繑鍥炵殑鏁版嵁 - */ - public Response execute() { - return request.send(); - } - - - public void addBasicAuthorization(String username,String password) { - Preconditions.checkEmptyString(username, "parameter username is null"); - Preconditions.checkEmptyString(password, "parameter password is null"); - Preconditions.checkNotNull(request, "RestClient is null"); - request.addHeader(AuthorizationHeader.AUTHORIZATION_HEADERNAME, AuthorizationHeader.createBasic(username, password)); - } - - public void addBearerAuthorization(String bearer) { - Preconditions.checkEmptyString(bearer, "parameter bearer is null"); - Preconditions.checkNotNull(request, "RestClient is null"); - request.addHeader(AuthorizationHeader.AUTHORIZATION_HEADERNAME, AuthorizationHeader.createBearer(bearer)); - } - - /** - * set REST Content - * - * @param content - */ - public void addRestContent(String content) - { - this.request.addRestContent(content) ; - } - - /** - * set REST Content - * - * @param content - */ - public void addRestObject(Object content) - { - this.request.addRestObject(content); - } - - /** - * set REST Content - * - * @param content - */ - public void addRestContent(byte[] content) - { - this.request.addRestContent(content); - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/SignatureType.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/SignatureType.java deleted file mode 100644 index d3ee2d076..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/SignatureType.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.http; - -public enum SignatureType -{ - Header, - QueryString -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/package-info.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/http/package-info.java deleted file mode 100644 index 5a7bb9b15..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/http/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -/** - * @author Administrator - * - */ -package org.maxkey.client.http; diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/ltpa/LtpaUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/ltpa/LtpaUtils.java deleted file mode 100644 index 29de0a78d..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/ltpa/LtpaUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.ltpa; - -import java.io.UnsupportedEncodingException; -import java.util.HashMap; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.codec.DecoderException; -import org.apache.commons.codec.binary.Hex; -import org.maxkey.client.crypto.Base64Utils; -import org.maxkey.client.crypto.ReciprocalUtils; -import org.maxkey.client.utils.JsonUtils; - -public class LtpaUtils { - - public static String readLtpa(HttpServletRequest request,String ltpaDomain,String ltpaName){ - Cookie[] cookies = request.getCookies(); - if(cookies!=null) { - for (int i = 0; i < cookies.length; i++) { - if(cookies[i].getName().equalsIgnoreCase(ltpaName)){ - return cookies[i].getValue(); - } - } - } - return null; - } - - public static String decode(String ltpaString,String algorithmKey, String algorithm){ - - String token=ReciprocalUtils.decoder(Base64Utils.base64UrlDecode(ltpaString), algorithmKey, algorithm); - - try { - token=new String(Hex.decodeHex(token.toCharArray()),"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (DecoderException e) { - e.printStackTrace(); - } - - return token; - } - - - @SuppressWarnings("unchecked") - public static HashMap parseLtpaJson(String token){ - HashMap tokenMap=new HashMap(); - - tokenMap=JsonUtils.gson2Object(token, tokenMap.getClass()); - - return tokenMap; - } - - public static void main(String[] args) { - // TODO Auto-generated method stub - String token="ICHQ%2F1Tdzw214UNw9fKEjRNFbvOlGdXyxVjF9I7kwEo%3D"; - String tokenString=LtpaUtils.decode(token, "x8zPbCya", ReciprocalUtils.Algorithm.DES); - System.out.println(tokenString); - - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/OAuthClient.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/OAuthClient.java deleted file mode 100644 index 775cfd64f..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/OAuthClient.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.maxkey.client.http.AuthorizationHeader; -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.domain.OIDCUserInfo; -import org.maxkey.client.oauth.domain.UserInfo; -import org.maxkey.client.oauth.model.OAuthConstants; -import org.maxkey.client.oauth.model.OAuthRequest; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.utils.JsonUtils; -import org.maxkey.client.utils.Preconditions; - - -public class OAuthClient { - - private static Log log = LogFactory.getLog(OAuthClient. class ); - private static final String DEFAULT_WEB_URL = "http://sso.maxkey.org/maxkey"; - - public static String OAUTH_V20_USERINFO_URI=DEFAULT_WEB_URL+"/api/oauth/v20/me"; - - public static String OAUTH_V10A_USERINFO_URI=DEFAULT_WEB_URL+"/api/oauth/v10a/me"; - - public static String OPENID_CONNECT_V10A_USERINFO_URI=DEFAULT_WEB_URL+"/api/connect/v10/userinfo"; - - //action method - private HttpVerb method = HttpVerb.GET; - //request Service - private OAuthRequest request; - - - public OAuthClient(String url) { - Preconditions.checkEmptyString(url, "Invalid request url"); - - request = new OAuthRequest(method, url); - } - - public OAuthClient(String url,String accessToken) { - - Preconditions.checkEmptyString(url, "Invalid request url"); - - request = new OAuthRequest(method, url); - - addParameter(OAuthConstants.ACCESS_TOKEN, accessToken); - } - - - /** - * 鏋勯�犳柟娉� - * - * @param method 璇锋眰鏂规硶 - * @param url 璇锋眰url - */ - public OAuthClient(String url,HttpVerb method) { - Preconditions.checkEmptyString(url, "Invalid request url"); - if(method != null) { - this.method = method; - } - request = new OAuthRequest(method, url); - } - - /** - * 灏哸ccess token闄勫姞鍒拌姹傚弬鏁颁腑 - * - * @param accessToken - */ - public void signAccessToken(Token accessToken) { - Preconditions.checkNotNull(request, "OAuthRequest is null"); - addParameter(OAuthConstants.ACCESS_TOKEN, accessToken.getToken()); - } - - /** - * 娣诲姞璇锋眰鍙傛暟 - * - * @param name 鍙傛暟鍚� - * @param value 鍙傛暟鍊� - */ - public void addParameter(String name,String value) { - Preconditions.checkEmptyString(name, "parameter name is null"); - Preconditions.checkNotNull(request, "OAuthRequest is null"); - if(HttpVerb.GET == method) { - request.addQuerystringParameter(name, value); - } else if(HttpVerb.POST == method) { - request.addBodyParameter(name, value); - } - } - - /** - * 娣诲姞璇锋眰Header - * - * @param name 鍙傛暟鍚� - * @param value 鍙傛暟鍊� - */ - public void addHeader(String name,String value) { - Preconditions.checkEmptyString(name, "parameter name is null"); - Preconditions.checkNotNull(request, "OAuthRequest is null"); - request.addHeader(name, value); - } - - /** - * 鍙戦�佽姹傦紝鑾峰彇杩斿洖鐨勬暟鎹� - * - * @return Response 鏈嶅姟绔繑鍥炵殑鏁版嵁 - */ - public Response execute() { - return request.send(); - } - - public Token requestAccessToken(){ - String tokenString=execute().getBody(); - Token token =JsonUtils.gson2Object(tokenString, Token.class); - log.debug("Request token : "+token); - return token; - } - - public void addBasicAuthorization(String username,String password) { - Preconditions.checkEmptyString(username, "parameter username is null"); - Preconditions.checkEmptyString(password, "parameter password is null"); - Preconditions.checkNotNull(request, "OAuthRequest is null"); - request.addHeader(AuthorizationHeader.AUTHORIZATION_HEADERNAME, AuthorizationHeader.createBasic(username, password)); - } - - public void addBearerAuthorization(String bearer) { - Preconditions.checkEmptyString(bearer, "parameter bearer is null"); - Preconditions.checkNotNull(request, "OAuthRequest is null"); - request.addHeader(AuthorizationHeader.AUTHORIZATION_HEADERNAME, AuthorizationHeader.createBearer(bearer)); - } - - public UserInfo getUserInfo(String accessToken){ - - addParameter(OAuthConstants.ACCESS_TOKEN, accessToken); - - Response response = execute(); - - log.debug("Request UserInfo : "+response.getBody()); - - UserInfo userInfo = (UserInfo) JsonUtils.gson2Object(response.getBody(), UserInfo.class); - - userInfo.setResponseString(response.getBody()); - - if(userInfo.getError() != null && !"".equals(userInfo.getError().trim())) { - } - - log.debug("UserInfo : "+userInfo); - return userInfo; - } - - public OIDCUserInfo getOIDCUserInfo(String accessToken){ - - addHeader("Authorization", accessToken); - - Response response = execute(); - - log.debug("Request OIDCUserInfo : "+response.getBody()); - - OIDCUserInfo userInfo = (OIDCUserInfo) JsonUtils.gson2Object(response.getBody(), OIDCUserInfo.class); - - userInfo.setResponseString(response.getBody()); - - if(userInfo.getError() != null && !"".equals(userInfo.getError().trim())) { - } - - log.debug("UserInfo : "+userInfo); - return userInfo; - } - - /** - * set REST Content - * - * @param content - */ - public void addRestContent(String content) - { - this.request.addRestContent(content) ; - } - - /** - * set REST Content - * - * @param content - */ - public void addRestObject(Object content) - { - this.request.addRestObject(content); - } - - /** - * set REST Content - * - * @param content - */ - public void addRestContent(byte[] content) - { - this.request.addRestContent(content); - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/ServiceBuilder.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/ServiceBuilder.java deleted file mode 100644 index 66f2d73fd..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/ServiceBuilder.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.builder; - -import java.io.*; - -import org.maxkey.client.http.SignatureType; -import org.maxkey.client.oauth.builder.api.*; -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.oauth.oauth.*; -import org.maxkey.client.utils.Preconditions; - -/** - * Implementation of the Builder pattern, with a fluent interface that creates a - * {@link OAuthService} - * - * @author Pablo Fernandez - * - */ -public class ServiceBuilder -{ - private String apiKey; - private String apiSecret; - private String callback; - private Api api; - private String scope; - private SignatureType signatureType; - private OutputStream debugStream; - - /** - * Default constructor - */ - public ServiceBuilder() - { - this.callback = OAuthConstants.OUT_OF_BAND; - this.signatureType = SignatureType.Header; - this.debugStream = null; - } - - /** - * Configures the {@link Api} - * - * @param apiClass the class of one of the existent {@link Api}s on org.scribe.api package - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder provider(Class apiClass) - { - this.api = createApi(apiClass); - return this; - } - - private Api createApi(Class apiClass) - { - Preconditions.checkNotNull(apiClass, "Api class cannot be null"); - Api api; - try - { - api = apiClass.newInstance(); - } - catch(Exception e) - { - throw new OAuthException("Error while creating the Api object", e); - } - return api; - } - - /** - * Configures the {@link Api} - * - * Overloaded version. Let's you use an instance instead of a class. - * - * @param api instance of {@link Api}s - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder provider(Api api) - { - Preconditions.checkNotNull(api, "Api cannot be null"); - this.api = api; - return this; - } - - /** - * Adds an OAuth callback url - * - * @param callback callback url. Must be a valid url or 'oob' for out of band OAuth - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder callback(String callback) - { - Preconditions.checkNotNull(callback, "Callback can't be null"); - this.callback = callback; - return this; - } - - /** - * Configures the api key - * - * @param apiKey The api key for your application - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder apiKey(String apiKey) - { - Preconditions.checkEmptyString(apiKey, "Invalid Api key"); - this.apiKey = apiKey; - return this; - } - - /** - * Configures the api secret - * - * @param apiSecret The api secret for your application - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder apiSecret(String apiSecret) - { - Preconditions.checkEmptyString(apiSecret, "Invalid Api secret"); - this.apiSecret = apiSecret; - return this; - } - - /** - * Configures the OAuth scope. This is only necessary in some APIs (like Google's). - * - * @param scope The OAuth scope - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder scope(String scope) - { - Preconditions.checkEmptyString(scope, "Invalid OAuth scope"); - this.scope = scope; - return this; - } - - /** - * Configures the signature type, choose between header, querystring, etc. Defaults to Header - * - * @param scope The OAuth scope - * @return the {@link ServiceBuilder} instance for method chaining - */ - public ServiceBuilder signatureType(SignatureType type) - { - Preconditions.checkNotNull(type, "Signature type can't be null"); - this.signatureType = type; - return this; - } - - public ServiceBuilder debugStream(OutputStream stream) - { - Preconditions.checkNotNull(stream, "debug stream can't be null"); - this.debugStream = stream; - return this; - } - - public ServiceBuilder debug() - { - this.debugStream(System.out); - return this; - } - - /** - * Returns the fully configured {@link OAuthService} - * - * @return fully configured {@link OAuthService} - */ - public OAuthService build() - { - Preconditions.checkNotNull(api, "You must specify a valid api through the provider() method"); - Preconditions.checkEmptyString(apiKey, "You must provide an api key"); - Preconditions.checkEmptyString(apiSecret, "You must provide an api secret"); - return api.createService(new OAuthConfig(apiKey, apiSecret, callback, signatureType, scope, debugStream)); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/Api.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/Api.java deleted file mode 100644 index a2284f87e..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/Api.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.builder.api; - - -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.oauth.oauth.*; - -/** - * Contains all the configuration needed to instantiate a valid {@link OAuthService} - * - * @author Pablo Fernandez - * - */ -public interface Api -{ - /** - * Creates an {@link OAuthService} - * - * @param apiKey your application api key - * @param apiSecret your application api secret - * @param callback the callback url (or 'oob' for out of band OAuth) - * @param scope the OAuth scope - * - * @return fully configured {@link OAuthService} - */ - OAuthService createService(OAuthConfig config); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/DefaultApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/DefaultApi20.java deleted file mode 100644 index fb5e4209c..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/DefaultApi20.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.builder.api; - - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.oauth.extractors.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.oauth.oauth.*; - -/** - * Default implementation of the OAuth protocol, version 2.0 (draft 11) - * - * This class is meant to be extended by concrete implementations of the API, - * providing the endpoints and endpoint-http-verbs. - * - * If your Api adheres to the 2.0 (draft 11) protocol correctly, you just need to extend - * this class and define the getters for your endpoints. - * - * If your Api does something a bit different, you can override the different - * extractors or services, in order to fine-tune the process. Please read the - * javadocs of the interfaces to get an idea of what to do. - * - * @author Diego Silveira - * - */ -public abstract class DefaultApi20 implements Api -{ - - /** - * Returns the access token extractor. - * - * @return access token extractor - */ - public AccessTokenExtractor getAccessTokenExtractor() - { - return new TokenExtractor20Impl(); - } - - /** - * Returns the verb for the access token endpoint (defaults to GET) - * - * @return access token endpoint verb - */ - public HttpVerb getAccessTokenVerb() - { - return HttpVerb.GET; - } - - /** - * Returns the URL that receives the access token requests. - * - * @return access token URL - */ - public abstract String getAccessTokenEndpoint(); - - - public abstract String getGrantType() ; - /** - * Returns the URL where you should redirect your users to authenticate - * your application. - * - * @param config OAuth 2.0 configuration param object - * @return the URL where you should redirect your users - */ - public abstract String getAuthorizationUrl(OAuthConfig config); - - /** - * {@inheritDoc} - */ - public OAuthService createService(OAuthConfig config) - { - return new OAuth20ServiceImpl(this, config); - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java deleted file mode 100644 index 7795a1f0b..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyApi20.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.builder.api; - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.oauth.extractors.AccessTokenExtractor; -import org.maxkey.client.oauth.extractors.GsonJsonTokenExtractor; -import org.maxkey.client.oauth.model.OAuthConfig; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -public class MaxkeyApi20 extends DefaultApi20 { - //approval_prompt:force or auto - private static final String DEFAULT_WEB_URL = "https://sso.maxkey.top/maxkey"; - - private static final String AUTHORIZATION_URL = "%s/oauth/v20/authorize?client_id=%s&response_type=code&redirect_uri=%s&approval_prompt=auto"; - - private static final String SCOPED_AUTHORIZE_URL = String.format("%s&scope=%%s", AUTHORIZATION_URL); - - public MaxkeyApi20() { - - } - - - @Override - public String getAccessTokenEndpoint() { - return getWebUrl() + "/oauth/v20/token?grant_type=authorization_code"; - } - - - @Override - public String getAuthorizationUrl(OAuthConfig config) { - Preconditions.checkValidUrl(config.getCallback(), "Must provide a valid url as callback. Secure does not support OOB"); - if(config.hasScope()) { - return String.format(SCOPED_AUTHORIZE_URL, getWebUrl(),config.getApiKey(), HttpEncoder.encode(config.getCallback()), HttpEncoder.encode(config.getScope())); - } else { - return String.format(AUTHORIZATION_URL, getWebUrl(),config.getApiKey(), HttpEncoder.encode(config.getCallback())); - } - } - - - - @Override - public HttpVerb getAccessTokenVerb() { - return HttpVerb.POST; - } - - - @Override - public AccessTokenExtractor getAccessTokenExtractor() { - return new GsonJsonTokenExtractor(); - } - - private String getWebUrl() { - String webUrl = null; - if(webUrl == null || "".equals(webUrl)) { - webUrl = DEFAULT_WEB_URL; - } - return webUrl; - } - - - @Override - public String getGrantType() { - // TODO Auto-generated method stub - return "authorization_code"; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java deleted file mode 100644 index 1507e6d5e..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/MaxkeyPasswordApi20.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.builder.api; - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.oauth.extractors.AccessTokenExtractor; -import org.maxkey.client.oauth.extractors.GsonJsonTokenExtractor; -import org.maxkey.client.oauth.model.OAuthConfig; - - - -/** - * OAuth 2.0 api. - */ -public class MaxkeyPasswordApi20 extends DefaultApi20 { - - private String accessTokenUrl; - private String grantType = "password"; - private String scope = "&scope=%s"; - private String accessTokenMethod = "POST"; - - private static final String AUTHORIZE_PARAM = "&client_id=%s&client_secret=%s&username=%s&password=%s"; - - public MaxkeyPasswordApi20(String accessTokenUrl) { - super(); - this.accessTokenUrl = accessTokenUrl; - } - - @Override - public HttpVerb getAccessTokenVerb() { - if (accessTokenMethod != null - && accessTokenMethod.toUpperCase().equals("POST")) { - return HttpVerb.POST; - } else { - return HttpVerb.GET; - } - } - - @Override - public AccessTokenExtractor getAccessTokenExtractor() { - return new GsonJsonTokenExtractor(); - } - - @Override - public String getAccessTokenEndpoint() { - if (accessTokenUrl.indexOf("?") > 0) { - return accessTokenUrl + "&grant_type=" + grantType+ AUTHORIZE_PARAM; - } else { - return accessTokenUrl + "?grant_type=" + grantType+ AUTHORIZE_PARAM; - } - } - - public String getAuthorizationUrl(OAuthConfig config,String username,String password) { - return String.format(getAccessTokenEndpoint(), - config.getApiKey(), - config.getApiSecret(), - username, - password); - } - - public String getAccessTokenUrl() { - return accessTokenUrl; - } - - public void setAccessTokenUrl(String accessTokenUrl) { - this.accessTokenUrl = accessTokenUrl; - } - - @Override - public String toString() { - return "OAuthApi20 [accessTokenUrl=" + accessTokenUrl + ", grantType=" - + grantType + ", scope=" + scope + "]"; - } - - @Override - public String getAuthorizationUrl(OAuthConfig config) { - return ""; - } - - @Override - public String getGrantType() { - // TODO Auto-generated method stub - return "authorization_code"; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/OAuthApi20.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/OAuthApi20.java deleted file mode 100644 index 3a0a81509..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/builder/api/OAuthApi20.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.builder.api; - - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.oauth.extractors.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.HttpEncoder; - -/** - * OAuth 2.0 api. - */ -public class OAuthApi20 extends DefaultApi20 -{ - //private static final String AUTHORIZE_URL = "https://api.weibo.com/oauth2/authorize?client_id=%s&redirect_uri=%s&response_type=code"; - //private static final String SCOPED_AUTHORIZE_URL = AUTHORIZE_URL + "&scope=%s"; - private String authorizeUrl; - private String accessTokenUrl; - private String grantType="authorization_code"; - private String scope="&scope=%s"; - private String accessTokenMethod="POST"; - - - public OAuthApi20(String authorizeUrl, String accessTokenUrl) { - super(); - this.authorizeUrl = authorizeUrl; - this.accessTokenUrl = accessTokenUrl; - } - - public OAuthApi20(String authorizeUrl, String accessTokenUrl,String accessTokenMethod) { - super(); - this.authorizeUrl = authorizeUrl; - this.accessTokenUrl = accessTokenUrl; - this.accessTokenMethod=accessTokenMethod; - } - - public OAuthApi20(String authorizeUrl, String accessTokenUrl,String grantType,String accessTokenMethod) { - super(); - this.authorizeUrl = authorizeUrl; - this.accessTokenUrl = accessTokenUrl; - this.grantType = grantType; - this.accessTokenMethod=accessTokenMethod; - } - - - public OAuthApi20(String authorizeUrl, String accessTokenUrl,String grantType, String accessTokenMethod,String scope) { - super(); - this.authorizeUrl = authorizeUrl; - this.accessTokenUrl = accessTokenUrl; - this.grantType = grantType; - this.accessTokenMethod=accessTokenMethod; - this.scope = scope; - } - - - @Override - public HttpVerb getAccessTokenVerb(){ - if(accessTokenMethod!= null &&accessTokenMethod.toUpperCase().equals("POST")){ - return HttpVerb.POST; - }else{ - return HttpVerb.GET; - } - } - - @Override - public AccessTokenExtractor getAccessTokenExtractor(){ - if(accessTokenUrl.indexOf("qq")>-1){ - return new QQTokenExtractor(); - } - return new GsonJsonTokenExtractor(); - } - - @Override - public String getAccessTokenEndpoint(){ - if(accessTokenUrl.indexOf("?")>0){ - return accessTokenUrl+"&grant_type="+grantType; - }else{ - return accessTokenUrl+"?grant_type="+grantType; - } - } - - @Override - public String getAuthorizationUrl(OAuthConfig config){ - // Append scope if present - //dingtalk - if(authorizeUrl.indexOf("oapi.dingtalk.com")>-1) { - if (config.hasScope()){ - return String.format(authorizeUrl+scope, config.getApiKey(), config.getCallback(), HttpEncoder.encode(config.getScope())); - } - else{ - return String.format(authorizeUrl, config.getApiKey(), config.getCallback()); - } - }else { - if (config.hasScope()){ - return String.format(authorizeUrl+scope, config.getApiKey(), HttpEncoder.encode(config.getCallback()), HttpEncoder.encode(config.getScope())); - } - else{ - return String.format(authorizeUrl, config.getApiKey(), HttpEncoder.encode(config.getCallback())); - } - } - } - - public String getAuthorizeUrl() { - return authorizeUrl; - } - - public void setAuthorizeUrl(String authorizeUrl) { - this.authorizeUrl = authorizeUrl; - } - - public String getAccessTokenUrl() { - return accessTokenUrl; - } - - public void setAccessTokenUrl(String accessTokenUrl) { - this.accessTokenUrl = accessTokenUrl; - } - - public String getGrantType() { - return grantType; - } - - public void setGrantType(String grantType) { - this.grantType = grantType; - } - - - @Override - public String toString() { - return "OAuthApi20 [authorizeUrl=" + authorizeUrl + ", accessTokenUrl=" - + accessTokenUrl + ", grantType=" + grantType + ", scope=" - + scope + "]"; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseDomain.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseDomain.java deleted file mode 100644 index 01aa6f168..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseDomain.java +++ /dev/null @@ -1,340 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.domain; - -import java.io.Serializable; -import java.util.Date; -import java.util.UUID; - -import org.apache.log4j.Logger; - -/** - * BaseDomain for connsec's domain - * - * @author Crystal.sea - * - */ -public class BaseDomain implements Serializable{ - /** - * - */ - private static final long serialVersionUID = -6290127045507211154L; - - - protected final static Logger logger = Logger.getLogger(BaseDomain.class); - - /** - * Domain id - */ - protected String id; - - - - protected String tid; - - protected String tname; - /** - * description - */ - protected String description; - - protected int status; - - protected int sortOrder; - - protected String createdBy; - - protected Date createdDate; - - protected String modifiedBy; - - protected Date modifiedDate; - - - protected String startDate; - protected String endDate; - - protected String error; - protected String error_description; - - protected String responseString; - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } - - public String getError_description() { - return error_description; - } - - public void setError_description(String error_description) { - this.error_description = error_description; - } - - public BaseDomain() { - - } - - /** - * @return the id - */ - public String getId() { - return id; - } - - - - - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - - - - - - /** - * @return the status - */ - public int getStatus() { - return status; - } - - - - - /** - * @param status the status to set - */ - public void setStatus(int status) { - this.status = status; - } - - - - /** - * @return the tid - */ - public String getTid() { - return tid; - } - - /** - * @param tid the tid to set - */ - public void setTid(String tid) { - this.tid = tid; - } - - /** - * @return the tname - */ - public String getTname() { - return tname; - } - - /** - * @param tname the tname to set - */ - public void setTname(String tname) { - this.tname = tname; - } - - /** - * @return the sortOrder - */ - public int getSortOrder() { - return sortOrder; - } - - - - - /** - * @param sortOrder the sortOrder to set - */ - public void setSortOrder(int sortOrder) { - this.sortOrder = sortOrder; - } - - - - - /** - * @return the createdBy - */ - public String getCreatedBy() { - return createdBy; - } - - - - - /** - * @param createdBy the createdBy to set - */ - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; - } - - - - - /** - * @return the createdDate - */ - public Date getCreatedDate() { - return createdDate; - } - - - - - /** - * @param createdDate the createdDate to set - */ - public void setCreatedDate(Date createdDate) { - this.createdDate = createdDate; - } - - - - - /** - * @return the modifiedBy - */ - public String getModifiedBy() { - return modifiedBy; - } - - - - - /** - * @param modifiedBy the modifiedBy to set - */ - public void setModifiedBy(String modifiedBy) { - this.modifiedBy = modifiedBy; - } - - - - - /** - * @return the modifiedDate - */ - public Date getModifiedDate() { - return modifiedDate; - } - - - - - /** - * @param modifiedDate the modifiedDate to set - */ - public void setModifiedDate(Date modifiedDate) { - this.modifiedDate = modifiedDate; - } - - - - - /** - * @return the description - */ - public String getDescription() { - return description; - } - - - - - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - - - - /** - * @return the startDate - */ - public String getStartDate() { - return startDate; - } - - - - - /** - * @param startDate the startDate to set - */ - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - - - - /** - * @return the endDate - */ - public String getEndDate() { - return endDate; - } - - /** - * @param endDate the endDate to set - */ - public void setEndDate(String endDate) { - this.endDate = endDate; - } - - public void genId() { - this.id=UUID.randomUUID().toString().toLowerCase(); - } - - public String getResponseString() { - return responseString; - } - - public void setResponseString(String responseString) { - this.responseString = responseString; - } - - @Override - public String toString() { - return "BaseDomain [id=" + id + ", tid=" + tid + ", tname=" + tname - + ", status=" + status + ", sortOrder=" + sortOrder - + ", createdBy=" + createdBy + ", createdDate=" + createdDate - + ", modifiedBy=" + modifiedBy + ", modifiedDate=" - + modifiedDate + ", description=" + description - + ", startDate=" + startDate + ", endDate=" + endDate + "]"; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseEntity.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseEntity.java deleted file mode 100644 index 63ec3433a..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/BaseEntity.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.domain; - -public class BaseEntity { - - private String error; - private String error_description; - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } - - public String getError_description() { - return error_description; - } - - public void setError_description(String error_description) { - this.error_description = error_description; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCAddress.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCAddress.java deleted file mode 100644 index 0cc99f48d..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCAddress.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.domain; - -public class OIDCAddress { - - public String country; - public String region; - public String locality; - public String street_address; - public String formatted; - public String postal_code; - /** - * - */ - public OIDCAddress() { - // TODO Auto-generated constructor stub - } - public String getCountry() { - return country; - } - public void setCountry(String country) { - this.country = country; - } - public String getRegion() { - return region; - } - public void setRegion(String region) { - this.region = region; - } - public String getLocality() { - return locality; - } - public void setLocality(String locality) { - this.locality = locality; - } - public String getStreet_address() { - return street_address; - } - public void setStreet_address(String street_address) { - this.street_address = street_address; - } - public String getFormatted() { - return formatted; - } - public void setFormatted(String formatted) { - this.formatted = formatted; - } - public String getPostal_code() { - return postal_code; - } - public void setPostal_code(String postal_code) { - this.postal_code = postal_code; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCUserInfo.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCUserInfo.java deleted file mode 100644 index 965e44d6a..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/OIDCUserInfo.java +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -package org.maxkey.client.oauth.domain; - -/** - * @author Administrator - * - */ -public class OIDCUserInfo { - - private String sub; - private String name; - private String preferred_username; - private String given_name; - private String family_name; - private String middle_name; - private String nickname; - private String profile; - private String picture; - private String website; - private String gender; - private String zoneinfo; - private String locale; - private String updated_time; - private String birthdate; - - - private String email; - private boolean email_verified; - - private String phone_number; - private boolean phone_number_verified; - private OIDCAddress address; - - - protected String error; - protected String error_description; - - protected String responseString; - - - /** - * - */ - public OIDCUserInfo() { - // TODO Auto-generated constructor stub - } - - public String getSub() { - return sub; - } - - public void setSub(String sub) { - this.sub = sub; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPreferred_username() { - return preferred_username; - } - - public void setPreferred_username(String preferred_username) { - this.preferred_username = preferred_username; - } - - public String getGiven_name() { - return given_name; - } - - public void setGiven_name(String given_name) { - this.given_name = given_name; - } - - public String getFamily_name() { - return family_name; - } - - public void setFamily_name(String family_name) { - this.family_name = family_name; - } - - public String getMiddle_name() { - return middle_name; - } - - public void setMiddle_name(String middle_name) { - this.middle_name = middle_name; - } - - public String getNickname() { - return nickname; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - - public String getProfile() { - return profile; - } - - public void setProfile(String profile) { - this.profile = profile; - } - - public String getPicture() { - return picture; - } - - public void setPicture(String picture) { - this.picture = picture; - } - - public String getWebsite() { - return website; - } - - public void setWebsite(String website) { - this.website = website; - } - - public String getGender() { - return gender; - } - - public void setGender(String gender) { - this.gender = gender; - } - - public String getZoneinfo() { - return zoneinfo; - } - - public void setZoneinfo(String zoneinfo) { - this.zoneinfo = zoneinfo; - } - - public String getLocale() { - return locale; - } - - public void setLocale(String locale) { - this.locale = locale; - } - - public String getUpdated_time() { - return updated_time; - } - - public void setUpdated_time(String updated_time) { - this.updated_time = updated_time; - } - - public String getBirthdate() { - return birthdate; - } - - public void setBirthdate(String birthdate) { - this.birthdate = birthdate; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public boolean isEmail_verified() { - return email_verified; - } - - public void setEmail_verified(boolean email_verified) { - this.email_verified = email_verified; - } - - public String getPhone_number() { - return phone_number; - } - - public void setPhone_number(String phone_number) { - this.phone_number = phone_number; - } - - public boolean isPhone_number_verified() { - return phone_number_verified; - } - - public void setPhone_number_verified(boolean phone_number_verified) { - this.phone_number_verified = phone_number_verified; - } - - public OIDCAddress getAddress() { - return address; - } - - public void setAddress(OIDCAddress address) { - this.address = address; - } - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } - - public String getError_description() { - return error_description; - } - - public void setError_description(String error_description) { - this.error_description = error_description; - } - - public String getResponseString() { - return responseString; - } - - public void setResponseString(String responseString) { - this.responseString = responseString; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/UserInfo.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/UserInfo.java deleted file mode 100644 index 0a60c9d6e..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/domain/UserInfo.java +++ /dev/null @@ -1,792 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.domain; - -import java.util.Arrays; - - -/** - * @author Crystal.Sea - * - */ -public class UserInfo extends BaseDomain { - - /** - * - */ - private static final long serialVersionUID = 6402443942083382236L; - // - - protected String username; - - /** - * "Employee", "Supplier","Dealer","Contractor",Partner,Customer "Intern", - * "Temp", "External", and "Unknown" - */ - protected String userType; - protected String windowsAccount; - - // for user name - protected String displayName; - protected String nickName; - protected String nameZHSpell; - protected String nameZHShortSpell; - protected String givenName; - protected String middleName; - protected String familyName; - protected String honorificPrefix; - protected String honorificSuffix; - protected String formattedName; - - protected int married; - protected int gender; - protected String birthDate; - protected byte[] picture; - protected int idType; - protected String idCardNo; - protected String webSite; - protected String startWorkDate; - - // for security - protected int authnType; - protected String email; - protected String mobile; - protected int mobileVerified; - - protected String lastLoginTime; - protected String lastLoginIp; - protected String lastLogoffTime; - protected int passwordSetType; - protected Integer loginCount; - - protected String locale; - protected String timeZone; - protected String preferredLanguage; - - // for work - protected String workCountry; - protected String workRegion;// province; - protected String workLocality;// city; - protected String workStreetAddress; - protected String workAddressFormatted; - protected String workEmail; - protected String workPhoneNumber; - protected String workPostalCode; - protected String workFax; - // for home - protected String homeCountry; - protected String homeRegion;// province; - protected String homeLocality;// city; - protected String homeStreetAddress; - protected String homeAddressFormatted; - protected String homeEmail; - protected String homePhoneNumber; - protected String homePostalCode; - protected String homeFax; - // for company - protected String employeeNumber; - protected String costCenter; - protected String organization; - protected String division; - protected String departmentId; - protected String department; - protected String jobTitle; - protected String jobLevel; - protected String managerId; - protected String manager; - protected String assistantId; - protected String assistant; - protected String entryDate; - protected String quitDate; - - // for social contact - /** - * QQ WeiXin SinaWeibo Gtalk YiXin IMessage Skype Yahoo MSN Aim ICQ Xmpp - */ - protected String ims; - /* - * for extended Attribute from userType extraAttribute for database - * extraAttributeName & extraAttributeValue for page submit - */ - protected String extraAttribute; - - protected int online; - - public static class ONLINE { - // 在线 - public static int ONLINE = 0; - // 下线 - public static int OFFLINE = 1; - } - - public static class MARRIED { - // 未知 - public static int UNKNOWN = 0; - // 单身 - public static int SINGLE = 1; - // 结婚 - public static int MARRIED = 2; - // 离异 - public static int DIVORCE = 3; - // 丧偶 - public static int WIDOWED = 4; - - } - - public static class GENDER { - // 未知 - public static int UNKNOWN = 0; - // 女性 - public static int FEMALE = 1; - // 男性 - public static int MALE = 2; - } - - public static class IDTYPE { - // 未知 - public static int UNKNOWN = 0; - // 身份证 - public static int IDCARD = 1; - // 护照 - public static int PASSPORT = 2; - // 学生证 - public static int STUDENTCARD = 3; - // 军人证 - public static int MILITARYCARD = 4; - } - - public static class AUTHNTYPE { - // 用户名密码 - public static int NORMAL = 1; - // 手机 - public static int MOBILE = 2; - // 短信 - public static int SMS = 3; - // 邮箱 - public static int EMAIL = 4; - - public static int TIMEBASED_OPT = 5; - - public static int COUNTERBASED_OPT = 6; - - public static int HOTP_OPT = 7; - - public static int RSA_OPT = 8; - // 证书 - public static int CERTIFICATE = 9; - // usb证书 - public static int USBKEY = 10; - - } - - /** - * - */ - public UserInfo() { - super(); - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUserType() { - return userType; - } - - public void setUserType(String userType) { - this.userType = userType; - } - - public String getWindowsAccount() { - return windowsAccount; - } - - public void setWindowsAccount(String windowsAccount) { - this.windowsAccount = windowsAccount; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getNameZHSpell() { - return nameZHSpell; - } - - public void setNameZHSpell(String nameZHSpell) { - this.nameZHSpell = nameZHSpell; - } - - public String getNameZHShortSpell() { - return nameZHShortSpell; - } - - public void setNameZHShortSpell(String nameZHShortSpell) { - this.nameZHShortSpell = nameZHShortSpell; - } - - public String getGivenName() { - return givenName; - } - - public void setGivenName(String givenName) { - this.givenName = givenName; - } - - public String getMiddleName() { - return middleName; - } - - public void setMiddleName(String middleName) { - this.middleName = middleName; - } - - public String getFamilyName() { - return familyName; - } - - public void setFamilyName(String familyName) { - this.familyName = familyName; - } - - public String getHonorificPrefix() { - return honorificPrefix; - } - - public void setHonorificPrefix(String honorificPrefix) { - this.honorificPrefix = honorificPrefix; - } - - public String getHonorificSuffix() { - return honorificSuffix; - } - - public void setHonorificSuffix(String honorificSuffix) { - this.honorificSuffix = honorificSuffix; - } - - public String getFormattedName() { - return formattedName; - } - - public void setFormattedName(String formattedName) { - this.formattedName = formattedName; - } - - public int getMarried() { - return married; - } - - public void setMarried(int married) { - this.married = married; - } - - public int getGender() { - return gender; - } - - public void setGender(int gender) { - this.gender = gender; - } - - public String getBirthDate() { - return birthDate; - } - - public void setBirthDate(String birthDate) { - this.birthDate = birthDate; - } - - public byte[] getPicture() { - return picture; - } - - public void setPicture(byte[] picture) { - this.picture = picture; - } - - public int getIdType() { - return idType; - } - - public void setIdType(int idType) { - this.idType = idType; - } - - public String getIdCardNo() { - return idCardNo; - } - - public void setIdCardNo(String idCardNo) { - this.idCardNo = idCardNo; - } - - public String getWebSite() { - return webSite; - } - - public void setWebSite(String webSite) { - this.webSite = webSite; - } - - public String getStartWorkDate() { - return startWorkDate; - } - - public void setStartWorkDate(String startWorkDate) { - this.startWorkDate = startWorkDate; - } - - public int getAuthnType() { - return authnType; - } - - public void setAuthnType(int authnType) { - this.authnType = authnType; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public int getMobileVerified() { - return mobileVerified; - } - - public void setMobileVerified(int mobileVerified) { - this.mobileVerified = mobileVerified; - } - - public String getLastLoginTime() { - return lastLoginTime; - } - - public void setLastLoginTime(String lastLoginTime) { - this.lastLoginTime = lastLoginTime; - } - - public String getLastLoginIp() { - return lastLoginIp; - } - - public void setLastLoginIp(String lastLoginIp) { - this.lastLoginIp = lastLoginIp; - } - - public String getLastLogoffTime() { - return lastLogoffTime; - } - - public void setLastLogoffTime(String lastLogoffTime) { - this.lastLogoffTime = lastLogoffTime; - } - - public int getPasswordSetType() { - return passwordSetType; - } - - public void setPasswordSetType(int passwordSetType) { - this.passwordSetType = passwordSetType; - } - - public Integer getLoginCount() { - return loginCount; - } - - public void setLoginCount(Integer loginCount) { - this.loginCount = loginCount; - } - - public String getLocale() { - return locale; - } - - public void setLocale(String locale) { - this.locale = locale; - } - - public String getTimeZone() { - return timeZone; - } - - public void setTimeZone(String timeZone) { - this.timeZone = timeZone; - } - - public String getPreferredLanguage() { - return preferredLanguage; - } - - public void setPreferredLanguage(String preferredLanguage) { - this.preferredLanguage = preferredLanguage; - } - - public String getWorkCountry() { - return workCountry; - } - - public void setWorkCountry(String workCountry) { - this.workCountry = workCountry; - } - - public String getWorkRegion() { - return workRegion; - } - - public void setWorkRegion(String workRegion) { - this.workRegion = workRegion; - } - - public String getWorkLocality() { - return workLocality; - } - - public void setWorkLocality(String workLocality) { - this.workLocality = workLocality; - } - - public String getWorkStreetAddress() { - return workStreetAddress; - } - - public void setWorkStreetAddress(String workStreetAddress) { - this.workStreetAddress = workStreetAddress; - } - - public String getWorkAddressFormatted() { - return workAddressFormatted; - } - - public void setWorkAddressFormatted(String workAddressFormatted) { - this.workAddressFormatted = workAddressFormatted; - } - - public String getWorkEmail() { - return workEmail; - } - - public void setWorkEmail(String workEmail) { - this.workEmail = workEmail; - } - - public String getWorkPhoneNumber() { - return workPhoneNumber; - } - - public void setWorkPhoneNumber(String workPhoneNumber) { - this.workPhoneNumber = workPhoneNumber; - } - - public String getWorkPostalCode() { - return workPostalCode; - } - - public void setWorkPostalCode(String workPostalCode) { - this.workPostalCode = workPostalCode; - } - - public String getWorkFax() { - return workFax; - } - - public void setWorkFax(String workFax) { - this.workFax = workFax; - } - - public String getHomeCountry() { - return homeCountry; - } - - public void setHomeCountry(String homeCountry) { - this.homeCountry = homeCountry; - } - - public String getHomeRegion() { - return homeRegion; - } - - public void setHomeRegion(String homeRegion) { - this.homeRegion = homeRegion; - } - - public String getHomeLocality() { - return homeLocality; - } - - public void setHomeLocality(String homeLocality) { - this.homeLocality = homeLocality; - } - - public String getHomeStreetAddress() { - return homeStreetAddress; - } - - public void setHomeStreetAddress(String homeStreetAddress) { - this.homeStreetAddress = homeStreetAddress; - } - - public String getHomeAddressFormatted() { - return homeAddressFormatted; - } - - public void setHomeAddressFormatted(String homeAddressFormatted) { - this.homeAddressFormatted = homeAddressFormatted; - } - - public String getHomeEmail() { - return homeEmail; - } - - public void setHomeEmail(String homeEmail) { - this.homeEmail = homeEmail; - } - - public String getHomePhoneNumber() { - return homePhoneNumber; - } - - public void setHomePhoneNumber(String homePhoneNumber) { - this.homePhoneNumber = homePhoneNumber; - } - - public String getHomePostalCode() { - return homePostalCode; - } - - public void setHomePostalCode(String homePostalCode) { - this.homePostalCode = homePostalCode; - } - - public String getHomeFax() { - return homeFax; - } - - public void setHomeFax(String homeFax) { - this.homeFax = homeFax; - } - - public String getEmployeeNumber() { - return employeeNumber; - } - - public void setEmployeeNumber(String employeeNumber) { - this.employeeNumber = employeeNumber; - } - - public String getCostCenter() { - return costCenter; - } - - public void setCostCenter(String costCenter) { - this.costCenter = costCenter; - } - - public String getOrganization() { - return organization; - } - - public void setOrganization(String organization) { - this.organization = organization; - } - - public String getDivision() { - return division; - } - - public void setDivision(String division) { - this.division = division; - } - - public String getDepartmentId() { - return departmentId; - } - - public void setDepartmentId(String departmentId) { - this.departmentId = departmentId; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getJobTitle() { - return jobTitle; - } - - public void setJobTitle(String jobTitle) { - this.jobTitle = jobTitle; - } - - public String getJobLevel() { - return jobLevel; - } - - public void setJobLevel(String jobLevel) { - this.jobLevel = jobLevel; - } - - public String getManagerId() { - return managerId; - } - - public void setManagerId(String managerId) { - this.managerId = managerId; - } - - public String getManager() { - return manager; - } - - public void setManager(String manager) { - this.manager = manager; - } - - public String getAssistantId() { - return assistantId; - } - - public void setAssistantId(String assistantId) { - this.assistantId = assistantId; - } - - public String getAssistant() { - return assistant; - } - - public void setAssistant(String assistant) { - this.assistant = assistant; - } - - public String getEntryDate() { - return entryDate; - } - - public void setEntryDate(String entryDate) { - this.entryDate = entryDate; - } - - public String getQuitDate() { - return quitDate; - } - - public void setQuitDate(String quitDate) { - this.quitDate = quitDate; - } - - public String getIms() { - return ims; - } - - public void setIms(String ims) { - this.ims = ims; - } - - public String getExtraAttribute() { - return extraAttribute; - } - - public void setExtraAttribute(String extraAttribute) { - this.extraAttribute = extraAttribute; - } - - public int getOnline() { - return online; - } - - public void setOnline(int online) { - this.online = online; - } - - @Override - public String toString() { - return "UserInfo [username=" + username + ", userType=" + userType - + ", windowsAccount=" + windowsAccount + ", displayName=" - + displayName + ", nickName=" + nickName + ", nameZHSpell=" - + nameZHSpell + ", nameZHShortSpell=" + nameZHShortSpell - + ", givenName=" + givenName + ", middleName=" + middleName - + ", familyName=" + familyName + ", honorificPrefix=" - + honorificPrefix + ", honorificSuffix=" + honorificSuffix - + ", formattedName=" + formattedName + ", married=" + married - + ", gender=" + gender + ", birthDate=" + birthDate - + ", picture=" + Arrays.toString(picture) + ", idType=" - + idType + ", idCardNo=" + idCardNo + ", webSite=" + webSite - + ", startWorkDate=" + startWorkDate + ", authnType=" - + authnType + ", email=" + email + ", mobile=" + mobile - + ", mobileVerified=" + mobileVerified + ", lastLoginTime=" - + lastLoginTime + ", lastLoginIp=" + lastLoginIp - + ", lastLogoffTime=" + lastLogoffTime + ", passwordSetType=" - + passwordSetType + ", loginCount=" + loginCount + ", locale=" - + locale + ", timeZone=" + timeZone + ", preferredLanguage=" - + preferredLanguage + ", workCountry=" + workCountry - + ", workRegion=" + workRegion + ", workLocality=" - + workLocality + ", workStreetAddress=" + workStreetAddress - + ", workAddressFormatted=" + workAddressFormatted - + ", workEmail=" + workEmail + ", workPhoneNumber=" - + workPhoneNumber + ", workPostalCode=" + workPostalCode - + ", workFax=" + workFax + ", homeCountry=" + homeCountry - + ", homeRegion=" + homeRegion + ", homeLocality=" - + homeLocality + ", homeStreetAddress=" + homeStreetAddress - + ", homeAddressFormatted=" + homeAddressFormatted - + ", homeEmail=" + homeEmail + ", homePhoneNumber=" - + homePhoneNumber + ", homePostalCode=" + homePostalCode - + ", homeFax=" + homeFax + ", employeeNumber=" + employeeNumber - + ", costCenter=" + costCenter + ", organization=" - + organization + ", division=" + division + ", departmentId=" - + departmentId + ", department=" + department + ", jobTitle=" - + jobTitle + ", jobLevel=" + jobLevel + ", managerId=" - + managerId + ", manager=" + manager + ", assistantId=" - + assistantId + ", assistant=" + assistant + ", entryDate=" - + entryDate + ", quitDate=" + quitDate + ", ims=" + ims - + ", extraAttribute=" + extraAttribute + ", online=" + online - + "]"; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthConnectionException.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthConnectionException.java deleted file mode 100644 index b793390c5..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthConnectionException.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.exceptions; - -/** - * @author: Pablo Fernandez - */ -public class OAuthConnectionException extends OAuthException -{ - private static final String MSG = "There was a problem while creating a connection to the remote service."; - - public OAuthConnectionException(Exception e) - { - super(MSG, e); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthException.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthException.java deleted file mode 100644 index 3df1e3452..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthException.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.exceptions; - -/** - * Default scribe exception. - * Represents a problem in the OAuth signing process - * - * @author Pablo Fernandez - */ -public class OAuthException extends RuntimeException -{ - - /** - * Default constructor - * @param message message explaining what went wrong - * @param e original exception - */ - public OAuthException(String message, Exception e) - { - super(message, e); - } - - /** - * No-exception constructor. Used when there is no original exception - * - * @param message message explaining what went wrong - */ - public OAuthException(String message) - { - super(message, null); - } - - private static final long serialVersionUID = 1L; -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthParametersMissingException.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthParametersMissingException.java deleted file mode 100644 index 381357058..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthParametersMissingException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.exceptions; - -import org.maxkey.client.oauth.model.*; - -/** - * Specialized exception that represents a missing OAuth parameter. - * - * @author Pablo Fernandez - */ -public class OAuthParametersMissingException extends OAuthException -{ - - private static final long serialVersionUID = 1745308760111976671L; - private static final String MSG = "Could not find oauth parameters in request: %s. " - + "OAuth parameters must be specified with the addOAuthParameter() method"; - - /** - * Default constructor. - * - * @param request OAuthRequest that caused the error - */ - public OAuthParametersMissingException(OAuthRequest request) - { - super(String.format(MSG, request)); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthSignatureException.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthSignatureException.java deleted file mode 100644 index fe76cc2ec..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/exceptions/OAuthSignatureException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.exceptions; - -/** - * Specialized exception that represents a problem in the signature - * - * @author Pablo Fernandez - */ -public class OAuthSignatureException extends OAuthException -{ - private static final long serialVersionUID = 1L; - private static final String MSG = "Error while signing string: %s"; - - /** - * Default constructor - * - * @param stringToSign plain string that gets signed (HMAC-SHA, etc) - * @param e original exception - */ - public OAuthSignatureException(String stringToSign, Exception e) - { - super(String.format(MSG, stringToSign), e); - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/AccessTokenExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/AccessTokenExtractor.java deleted file mode 100644 index 54d7c4a0b..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/AccessTokenExtractor.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import org.maxkey.client.oauth.model.*; - -/** - * Simple command object that extracts a {@link Token} from a String - * - * @author Pablo Fernandez - */ -public interface AccessTokenExtractor -{ - /** - * Extracts the access token from the contents of an Http Response - * - * @param response the contents of the response - * @return OAuth access token - */ - public Token extract(String response); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractor.java deleted file mode 100644 index 5b992f031..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractor.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import org.maxkey.client.oauth.model.*; - -/** - * Simple command object that extracts a base string from a {@link OAuthRequest} - * - * @author Pablo Fernandez - */ -public interface BaseStringExtractor -{ - /** - * Extracts an url-encoded base string from the {@link OAuthRequest}. - * - * See the oauth spec for more info on this. - * - * @param request the OAuthRequest - * @return the url-encoded base string - */ - String extract(OAuthRequest request); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractorImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractorImpl.java deleted file mode 100644 index 8c87c1dad..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/BaseStringExtractorImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - - -import org.maxkey.client.http.ParameterList; -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -/** - * Default implementation of {@link BaseStringExtractor}. Conforms to OAuth 1.0a - * - * @author Pablo Fernandez - * - */ -public class BaseStringExtractorImpl implements BaseStringExtractor -{ - - private static final String AMPERSAND_SEPARATED_STRING = "%s&%s&%s"; - - /** - * {@inheritDoc} - */ - public String extract(OAuthRequest request) - { - checkPreconditions(request); - String verb = HttpEncoder.encode(request.getVerb().name()); - String url = HttpEncoder.encode(request.getSanitizedUrl()); - String params = getSortedAndEncodedParams(request); - return String.format(AMPERSAND_SEPARATED_STRING, verb, url, params); - } - - private String getSortedAndEncodedParams(OAuthRequest request) - { - ParameterList params = new ParameterList(); - params.addAll(request.getQueryStringParams()); - params.addAll(request.getBodyParams()); - params.addAll(new ParameterList(request.getOauthParameters())); - return params.sort().asOauthBaseString(); - } - - private void checkPreconditions(OAuthRequest request) - { - Preconditions.checkNotNull(request, "Cannot extract base string from null object"); - - if (request.getOauthParameters() == null || request.getOauthParameters().size() <= 0) - { - throw new OAuthParametersMissingException(request); - } - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/GsonJsonTokenExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/GsonJsonTokenExtractor.java deleted file mode 100644 index d851068c2..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/GsonJsonTokenExtractor.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.JsonUtils; -import org.maxkey.client.utils.Preconditions; - -public class GsonJsonTokenExtractor implements AccessTokenExtractor { - - public Token extract(String response) { - System.out.println("extract a token from : " + response); - Preconditions.checkEmptyString(response,"Cannot extract a token from a null or empty String"); - try { - Token token; - try { - token = JsonUtils.gson2Object(response, Token.class); - } catch (Exception e) { - token = JsonUtils.gson2Object("{\""+ response.replace("&", "\",\"").replace("=","\":\"") + "\"}", Token.class); - } - - if (token != null) { - token.setRawResponse(response); - token.setToken(token.getAccess_token()); - } - - return token; - } catch (Exception e) { - throw new OAuthException("Cannot extract an acces token. Response was: " + response); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractor.java deleted file mode 100644 index e4d5271ee..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractor.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import org.maxkey.client.oauth.model.*; - -/** - * Simple command object that generates an OAuth Authorization header to include in the request. - * - * @author Pablo Fernandez - */ -public interface HeaderExtractor -{ - /** - * Generates an OAuth 'Authorization' Http header to include in requests as the signature. - * - * @param request the OAuthRequest to inspect and generate the header - * @return the Http header value - */ - String extract(OAuthRequest request); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractorImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractorImpl.java deleted file mode 100644 index f3fca611c..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/HeaderExtractorImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import java.util.*; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -/** - * Default implementation of {@link HeaderExtractor}. Conforms to OAuth 1.0a - * - * @author Pablo Fernandez - * - */ -public class HeaderExtractorImpl implements HeaderExtractor -{ - private static final String PARAM_SEPARATOR = ", "; - private static final String PREAMBLE = "OAuth "; - public static final int ESTIMATED_PARAM_LENGTH = 20; - - /** - * {@inheritDoc} - */ - public String extract(OAuthRequest request) - { - checkPreconditions(request); - Map parameters = request.getOauthParameters(); - StringBuilder header = new StringBuilder(parameters.size() * ESTIMATED_PARAM_LENGTH); - header.append(PREAMBLE); - for (Map.Entry entry : parameters.entrySet()) - { - if(header.length() > PREAMBLE.length()) - { - header.append(PARAM_SEPARATOR); - } - header.append(String.format("%s=\"%s\"", entry.getKey(), HttpEncoder.encode(entry.getValue()))); - } - return header.toString(); - } - - private void checkPreconditions(OAuthRequest request) - { - Preconditions.checkNotNull(request, "Cannot extract a header from a null object"); - - if (request.getOauthParameters() == null || request.getOauthParameters().size() <= 0) - { - throw new OAuthParametersMissingException(request); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/JsonTokenExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/JsonTokenExtractor.java deleted file mode 100644 index 70c197fc6..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/JsonTokenExtractor.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import java.util.regex.*; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.Preconditions; - -public class JsonTokenExtractor implements AccessTokenExtractor -{ - private Pattern accessTokenPattern = Pattern.compile("\"access_token\":\\s*\"(\\S*?)\""); - - public Token extract(String response) - { - Preconditions.checkEmptyString(response, "Cannot extract a token from a null or empty String"); - Matcher matcher = accessTokenPattern.matcher(response); - if(matcher.find()) - { - return new Token(matcher.group(1), "", response); - } - else - { - throw new OAuthException("Cannot extract an acces token. Response was: " + response); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/QQTokenExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/QQTokenExtractor.java deleted file mode 100644 index 02f05a23d..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/QQTokenExtractor.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import java.util.HashMap; - -import org.apache.log4j.Logger; -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.Preconditions; - -public class QQTokenExtractor implements AccessTokenExtractor -{ - final static Logger log = Logger.getLogger(QQTokenExtractor.class); - public Token extract(String response){ - - log.debug("extract a token from : "+response); - Preconditions.checkEmptyString(response, "Cannot extract a token from a null or empty String"); - try{ - - String [] fields=response.split("&"); - HashMap tokenMap=new HashMap(); - for(String field : fields){ - String [] sfield=field.split("="); - if(sfield.length==2){ - tokenMap.put(sfield[0], sfield[1]); - } - } - log.debug("token map : "+tokenMap); - Token token =new Token(tokenMap.get("access_token").toString(),"",response,tokenMap); - return token; - } - catch(Exception e){ - throw new OAuthException("Cannot extract an acces token. Response was: " + response); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/RequestTokenExtractor.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/RequestTokenExtractor.java deleted file mode 100644 index d5ffd5ef8..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/RequestTokenExtractor.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import org.maxkey.client.oauth.model.*; - -/** - * Simple command object that extracts a {@link Token} from a String - * - * @author Pablo Fernandez - */ -public interface RequestTokenExtractor -{ - /** - * Extracts the request token from the contents of an Http Response - * - * @param response the contents of the response - * @return OAuth access token - */ - public Token extract(String response); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractor20Impl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractor20Impl.java deleted file mode 100644 index a6509802f..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractor20Impl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import java.io.UnsupportedEncodingException; -import java.util.regex.*; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -/** - * Default implementation of {@AccessTokenExtractor}. Conforms to OAuth 2.0 - * - */ -public class TokenExtractor20Impl implements AccessTokenExtractor -{ - private static final String TOKEN_REGEX = "access_token=([^&]+)"; - private static final String EMPTY_SECRET = ""; - - /** - * {@inheritDoc} - */ - public Token extract(String response) - { - Preconditions.checkEmptyString(response, "Response body is incorrect. Can't extract a token from an empty string"); - - Matcher matcher = Pattern.compile(TOKEN_REGEX).matcher(response); - if (matcher.find()) - { - String token; - try { - token = HttpEncoder.decode(matcher.group(1)); - return new Token(token, EMPTY_SECRET, response); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - else - { - throw new OAuthException("Response body is incorrect. Can't extract a token from this: '" + response + "'", null); - } - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractorImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractorImpl.java deleted file mode 100644 index 3f2331926..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/extractors/TokenExtractorImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.extractors; - -import java.io.UnsupportedEncodingException; -import java.util.regex.*; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.oauth.model.*; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -/** - * Default implementation of {@RequestTokenExtractor} and {@AccessTokenExtractor}. Conforms to OAuth 1.0a - * - * The process for extracting access and request tokens is similar so this class can do both things. - * - * @author Pablo Fernandez - */ -public class TokenExtractorImpl implements RequestTokenExtractor, AccessTokenExtractor -{ - private static final Pattern TOKEN_REGEX = Pattern.compile("oauth_token=([^&]+)"); - private static final Pattern SECRET_REGEX = Pattern.compile("oauth_token_secret=([^&]*)"); - - /** - * {@inheritDoc} - */ - public Token extract(String response){ - Preconditions.checkEmptyString(response, "Response body is incorrect. Can't extract a token from an empty string"); - String token = extract(response, TOKEN_REGEX); - String secret = extract(response, SECRET_REGEX); - return new Token(token, secret, response); - } - - private String extract(String response, Pattern p){ - Matcher matcher = p.matcher(response); - if (matcher.find() && matcher.groupCount() >= 1){ - try { - return HttpEncoder.decode(matcher.group(1)); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - }else{ - throw new OAuthException("Response body is incorrect. Can't extract token and secret from this: '" + response + "'", null); - } - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConfig.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConfig.java deleted file mode 100644 index c00ecd537..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConfig.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.model; - -import java.io.*; - -import org.maxkey.client.http.SignatureType; - -/** - * Parameter object that groups OAuth config values - * - * @author Pablo Fernandez - */ -public class OAuthConfig { - private final String apiKey; - private final String apiSecret; - private final String callback; - private final SignatureType signatureType; - private final String scope; - private String approvalPrompt; // 授权方式:force or auto - private String responseType; // 返回类型:code、passwrod、token - private final OutputStream debugStream; - - public OAuthConfig(String key, String secret) { - this(key, secret, null, null, null, null); - } - - public OAuthConfig(String key, String secret, String callback) { - this(key, secret, callback, null, null, null); - } - - public OAuthConfig(String key, String secret, String callback, - SignatureType type, String scope, OutputStream stream) { - this.apiKey = key; - this.apiSecret = secret; - this.callback = callback; - this.signatureType = type; - this.scope = scope; - this.debugStream = stream; - } - - public String getApiKey() { - return apiKey; - } - - public String getApiSecret() { - return apiSecret; - } - - public String getCallback() { - return callback; - } - - public SignatureType getSignatureType() { - return signatureType; - } - - public String getScope() { - return scope; - } - - public boolean hasScope() { - return scope != null; - } - - public String getApprovalPrompt() { - return approvalPrompt; - } - - public void setApprovalPrompt(String approvalPrompt) { - this.approvalPrompt = approvalPrompt; - } - - public String getResponseType() { - return responseType; - } - - public void setResponseType(String responseType) { - this.responseType = responseType; - } - - public void log(String message) { - if (debugStream != null) { - message = message + "\n"; - try { - debugStream.write(message.getBytes("UTF8")); - } catch (Exception e) { - throw new RuntimeException( - "there were problems while writting to the debug stream", - e); - } - } - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConstants.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConstants.java deleted file mode 100644 index 5825c6655..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthConstants.java +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2010 Pablo Fernandez - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - */ -package org.maxkey.client.oauth.model; - - -/** - * This class contains OAuth constants, used project-wide - */ -public interface OAuthConstants { - - String TIMESTAMP = "oauth_timestamp"; - String SIGN_METHOD = "oauth_signature_method"; - String SIGNATURE = "oauth_signature"; - String CONSUMER_SECRET = "oauth_consumer_secret"; - String CONSUMER_KEY = "oauth_consumer_key"; - String CALLBACK = "oauth_callback"; - String VERSION = "oauth_version"; - String NONCE = "oauth_nonce"; - String REALM = "realm"; - String PARAM_PREFIX = "oauth_"; - String TOKEN = "oauth_token"; - String TOKEN_SECRET = "oauth_token_secret"; - String OUT_OF_BAND = "oob"; - String VERIFIER = "oauth_verifier"; - String HEADER = "Authorization"; - String SCOPE = "scope"; - String BASIC = "Basic"; - - // OAuth 2.0 - String ACCESS_TOKEN = "access_token"; - String CLIENT_ID = "client_id"; - String CLIENT_SECRET = "client_secret"; - String REDIRECT_URI = "redirect_uri"; - String CODE = "code"; - String REFRESH_TOKEN = "refresh_token"; - String GRANT_TYPE = "grant_type"; - String AUTHORIZATION_CODE = "authorization_code"; - String STATE = "state"; - String USERNAME = "username"; - String PASSWORD = "password"; - String RESPONSE_TYPE = "response_type"; - String RESPONSE_TYPE_CODE = "code"; - - //not OAuth specific - String USER_AGENT_HEADER_NAME = "User-Agent"; - - public static final Token EMPTY_TOKEN = new Token("", ""); -} - - diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthRequest.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthRequest.java deleted file mode 100644 index a05d01460..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/OAuthRequest.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.model; - -import java.util.*; - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Request; - -/** - * The representation of an OAuth HttpRequest. - * - * Adds OAuth-related functionality to the {@link Request} - * - * @author Pablo Fernandez - */ -public class OAuthRequest extends Request -{ - private static final String OAUTH_PREFIX = "oauth_"; - private Map oauthParameters; - - /** - * Default constructor. - * - * @param verb Http verb/method - * @param url resource URL - */ - public OAuthRequest(HttpVerb verb, String url) - { - super(verb, url); - this.oauthParameters = new HashMap(); - } - - /** - * Adds an OAuth parameter. - * - * @param key name of the parameter - * @param value value of the parameter - * - * @throws IllegalArgumentException if the parameter is not an OAuth parameter - */ - public void addOAuthParameter(String key, String value) - { - oauthParameters.put(checkKey(key), value); - } - - public void addParameter(String key, String value) - { - oauthParameters.put(key, value); - } - - private String checkKey(String key) - { - if (key.startsWith(OAUTH_PREFIX) || key.equals(OAuthConstants.SCOPE)) - { - return key; - } - else - { - throw new IllegalArgumentException(String.format("OAuth parameters must either be '%s' or start with '%s'", OAuthConstants.SCOPE, OAUTH_PREFIX)); - } - } - - /** - * Returns the {@link Map} containing the key-value pair of parameters. - * - * @return parameters as map - */ - public Map getOauthParameters() - { - return oauthParameters; - } - - @Override - public String toString() - { - return String.format("@OAuthRequest(%s, %s)", getVerb(), getUrl()); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Token.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Token.java deleted file mode 100644 index b30b759dc..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Token.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.model; - -import java.io.*; -import java.util.Map; - -import org.maxkey.client.utils.Preconditions; - -/** - * Represents an OAuth 2 Access token. - *

- * http://tools.ietf.org/html/rfc6749#section-5.1 - * - * @see OAuth 2 Access Token Specification

- */ -public class Token implements Serializable { - private static final long serialVersionUID = 715000866082812683L; - - /* - * for return from Provider - */ - private String rawResponse; - private Map responseObject; - - /* - * for OAuth 1.0a & OAuth 2.0 - */ - /** - * access_token - *

- * REQUIRED. The access token issued by the authorization server.

- */ - private String access_token; - - private String token; - private String secret; - /** - * refresh_token - *

- * OPTIONAL. The refresh token, which can be used to obtain new access tokens using the same authorization grant as - * described in http://tools.ietf.org/html/rfc6749#section-6

- */ - private String refresh_token; - /** - * expires_in - *

- * RECOMMENDED. The lifetime in seconds of the access token. For example, the value "3600" denotes that the access - * token will expire in one hour from the time the response was generated. If omitted, the authorization server - * SHOULD provide the expiration time via other means or document the default value.

- */ - private String expires_in; - - /** - * scope - *

- * OPTIONAL, if identical to the scope requested by the client; otherwise, REQUIRED. The scope of the access token - * as described by http://tools.ietf.org/html/rfc6749#section-3.3

- */ - private String scope; - - private String signature; - /* - * for OpenID Connect - */ - /** - * token_type - *

- * REQUIRED. The type of the token issued as described in http://tools.ietf.org/html/rfc6749#section-7.1 Value is - * case insensitive.

- */ - private String token_type; - - private String id_token; - - /** - * https://self-issued.me - */ - private String sub_jwk; - /* - * for error - */ - private String error; - private String error_description; - - - /** - * - */ - public Token() { - rawResponse = null; - } - - /** - * Default constructor - * - * @param token - * token value. Can't be null. - * @param secret - * token secret. Can't be null. - */ - public Token(String token, String secret) { - this(token, secret, null); - } - - public Token(String token, String secret, String rawResponse) { - Preconditions.checkNotNull(token, "Token can't be null"); - Preconditions.checkNotNull(secret, "Secret can't be null"); - - this.token = token; - this.secret = secret; - this.rawResponse = rawResponse; - this.responseObject = null; - } - - public Token(String token, String secret, String rawResponse, - Map responseObject) { - this.token = token; - this.secret = secret; - this.rawResponse = rawResponse; - this.responseObject = responseObject; - } - - public String getAccess_token() { - if(access_token==null||access_token.equals("")){ - access_token=this.token; - } - - return access_token; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } - - public Map getResponseObject() { - return responseObject; - } - - public void setResponseObject(Map responseObject) { - this.responseObject = responseObject; - } - - public String getToken() { - if(token==null){ - token=this.access_token; - } - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } - - public String getRefresh_token() { - return refresh_token; - } - - public void setRefresh_token(String refresh_token) { - this.refresh_token = refresh_token; - } - - public String getExpires_in() { - return expires_in; - } - - public void setExpires_in(String expires_in) { - this.expires_in = expires_in; - } - - public String getSignature() { - return signature; - } - - public void setSignature(String signature) { - this.signature = signature; - } - - public String getToken_type() { - return token_type; - } - - public void setToken_type(String token_type) { - this.token_type = token_type; - } - - public String getId_token() { - return id_token; - } - - public void setId_token(String id_token) { - this.id_token = id_token; - } - - public String getSub_jwk() { - return sub_jwk; - } - - public void setSub_jwk(String sub_jwk) { - this.sub_jwk = sub_jwk; - } - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } - - public String getError_description() { - return error_description; - } - - public void setError_description(String error_description) { - this.error_description = error_description; - } - - public void setRawResponse(String rawResponse) { - this.rawResponse = rawResponse; - } - - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - - public String getRawResponse() { - if (rawResponse == null) { - throw new IllegalStateException( - "This token object was not constructed by scribe and does not have a rawResponse"); - } - return rawResponse; - } - - @Override - public String toString() { - return "Token [rawResponse=" + rawResponse + ", responseObject=" - + responseObject + ", access_token=" + access_token - + ", token=" + token + ", secret=" + secret - + ", refresh_token=" + refresh_token + ", expires_in=" - + expires_in + ", signature=" + signature + ", token_type=" - + token_type + ", id_token=" + id_token + ", sub_jwk=" - + sub_jwk + ", error=" + error + ", error_description=" - + error_description + "]"; - } - - /** - * Returns true if the token is empty (token = "", secret = "") - */ - public boolean isEmpty() { - return "".equals(this.token) && "".equals(this.secret); - } - - /** - * Factory method that returns an empty token (token = "", secret = ""). - * - * Useful for two legged OAuth. - */ - public static Token empty() { - return new Token("", ""); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - - Token that = (Token) o; - return token.equals(that.token) && secret.equals(that.secret); - } - - @Override - public int hashCode() { - return 31 * token.hashCode() + secret.hashCode(); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Verifier.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Verifier.java deleted file mode 100644 index 92cdb719e..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/model/Verifier.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.model; - -import org.maxkey.client.utils.Preconditions; - -/** - * Represents an OAuth verifier code. - * - * @author Pablo Fernandez - */ -public class Verifier -{ - - private final String value; - - /** - * Default constructor. - * - * @param value verifier value - */ - public Verifier(String value) - { - Preconditions.checkNotNull(value, "Must provide a valid string as verifier"); - this.value = value; - } - - public String getValue() - { - return value; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java deleted file mode 100644 index 422e9ae05..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuth20ServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.oauth; - - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.builder.api.*; -import org.maxkey.client.oauth.model.*; - -public class OAuth20ServiceImpl implements OAuthService -{ - private static final String VERSION = "2.0"; - - private final DefaultApi20 api; - private final OAuthConfig config; - - /** - * Default constructor - * - * @param api OAuth2.0 api information - * @param config OAuth 2.0 configuration param object - */ - public OAuth20ServiceImpl(DefaultApi20 api, OAuthConfig config) - { - this.api = api; - this.config = config; - } - - - /** - * Default constructor - * - * @param clientId - * @param clientSecret - * @param redirectUri - */ - public OAuth20ServiceImpl(String clientId, String clientSecret,String redirectUri) - { - this.api=new MaxkeyApi20(); - this.config =new OAuthConfig(clientId,clientSecret,redirectUri); - - } - - /** - * {@inheritDoc} - */ - public Token getAccessToken(Token requestToken, Verifier verifier) - { - OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint()); - if(api.getAccessTokenVerb().equals(HttpVerb.GET)){ - request.addQuerystringParameter(OAuthConstants.CLIENT_ID, config.getApiKey()); - request.addQuerystringParameter(OAuthConstants.CLIENT_SECRET, config.getApiSecret()); - request.addQuerystringParameter(OAuthConstants.CODE, verifier.getValue()); - request.addQuerystringParameter(OAuthConstants.REDIRECT_URI, config.getCallback()); - if(config.hasScope()) request.addQuerystringParameter(OAuthConstants.SCOPE, config.getScope()); - }else{ - request.getBodyParams().add(OAuthConstants.CLIENT_ID, config.getApiKey()); - request.getBodyParams().add(OAuthConstants.CLIENT_SECRET, config.getApiSecret()); - request.getBodyParams().add(OAuthConstants.CODE, verifier.getValue()); - request.getBodyParams().add(OAuthConstants.REDIRECT_URI, config.getCallback()); - request.getBodyParams().add(OAuthConstants.GRANT_TYPE, api.getGrantType()); - if(config.hasScope())request.getBodyParams().add(OAuthConstants.SCOPE, config.getScope()); - } - - Response response = request.send(); - return api.getAccessTokenExtractor().extract(response.getBody()); - } - - /** - * {@inheritDoc} - */ - public Token getRequestToken() - { - throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there"); - } - - /** - * {@inheritDoc} - */ - public String getVersion() - { - return VERSION; - } - - /** - * {@inheritDoc} - */ - public void signRequest(Token accessToken, OAuthRequest request) - { - request.addQuerystringParameter(OAuthConstants.ACCESS_TOKEN, accessToken.getToken()); - } - - /** - * {@inheritDoc} - */ - public String getAuthorizationUrl(Token requestToken) - { - return api.getAuthorizationUrl(config); - } - @Override - public void signAccessTokenRequest(Token accessToken, OAuthRequest request) { - // TODO Auto-generated method stub - request.addQuerystringParameter(OAuthConstants.ACCESS_TOKEN, accessToken.getToken()); - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java deleted file mode 100644 index 2313babd3..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthPasswordService.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.oauth; - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.MaxkeyPasswordApi20; -import org.maxkey.client.oauth.model.OAuthConfig; -import org.maxkey.client.oauth.model.OAuthRequest; -import org.maxkey.client.oauth.model.Token; - - -/** - * OAuth 2.0 api. - */ -public class OAuthPasswordService { - - private OAuthConfig config; - - private MaxkeyPasswordApi20 passwordApi20; - - public OAuthPasswordService() { - super(); - } - - public OAuthPasswordService(OAuthConfig config,MaxkeyPasswordApi20 passwordApi20) { - super(); - this.passwordApi20=passwordApi20; - this.config = config; - } - - public Token getAccessToken(String username, String password) { - try { - String accessTokenUrl=passwordApi20.getAuthorizationUrl(config, username, password); - System.out.println(accessTokenUrl); - OAuthRequest oauthRequest = new OAuthRequest(HttpVerb.GET,accessTokenUrl); - Response response = oauthRequest.send(); - return passwordApi20.getAccessTokenExtractor().extract(response.getBody()); - } catch(Exception e) { - e.printStackTrace(); - } - return null; - } - - public Response sendRequest(Token accessToken,HttpVerb requestMethod,String requestUrl) { - OAuthRequest oauthRequest = new OAuthRequest(requestMethod, requestUrl); - ServiceBuilder builder = new ServiceBuilder().provider(passwordApi20) - .apiKey(config.getApiKey()) - .apiSecret(config.getApiSecret()) - .callback(config.getCallback()); - OAuthService oAuthService=builder.build(); - oAuthService.signRequest(accessToken, oauthRequest); - return oauthRequest.send(); - } - public OAuthConfig getConfig() { - return config; - } - - public void setConfig(OAuthConfig config) { - this.config = config; - } - - public MaxkeyPasswordApi20 getPasswordApi20() { - return passwordApi20; - } - - public void setPasswordApi20(MaxkeyPasswordApi20 passwordApi20) { - this.passwordApi20 = passwordApi20; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthService.java deleted file mode 100644 index 4e8cc7566..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/oauth/OAuthService.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.oauth; - -import org.maxkey.client.oauth.model.*; - -/** - * The main Scribe object. - * - * A facade responsible for the retrieval of request and access tokens and for the signing of HTTP requests. - * - * @author Pablo Fernandez - */ -public interface OAuthService -{ - /** - * Retrieve the request token. - * - * @return request token - */ - public Token getRequestToken(); - - /** - * Retrieve the access token - * - * @param requestToken request token (obtained previously) - * @param verifier verifier code - * @return access token - */ - public Token getAccessToken(Token requestToken, Verifier verifier); - - /** - * Signs am OAuth request - * - * @param accessToken access token (obtained previously) - * @param request request to sign - */ - public void signRequest(Token accessToken, OAuthRequest request); - - - public void signAccessTokenRequest(Token accessToken, OAuthRequest request); - - /** - * Returns the OAuth version of the service. - * - * @return oauth version as string - */ - public String getVersion(); - - /** - * Returns the URL where you should redirect your users to authenticate - * your application. - * - * @param requestToken the request token you need to authorize - * @return the URL where you should redirect your users - */ - public String getAuthorizationUrl(Token requestToken); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/Base64Encoder.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/Base64Encoder.java deleted file mode 100644 index 3f4996be9..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/Base64Encoder.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -public abstract class Base64Encoder -{ - private static Base64Encoder instance; - - public static synchronized Base64Encoder getInstance() - { - if (instance == null) - { - instance = createEncoderInstance(); - } - return instance; - } - - private static Base64Encoder createEncoderInstance() - { - if (CommonsEncoder.isPresent()) - { - return new CommonsEncoder(); - } - else - { - return new DatatypeConverterEncoder(); - } - } - - public static String type() - { - return getInstance().getType(); - } - - public abstract String encode(byte[] bytes); - - public abstract String getType(); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/CommonsEncoder.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/CommonsEncoder.java deleted file mode 100644 index cdc9ddc43..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/CommonsEncoder.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -import org.apache.commons.codec.binary.*; -import org.maxkey.client.oauth.exceptions.*; - -import java.io.UnsupportedEncodingException; - -public class CommonsEncoder extends Base64Encoder -{ - - @Override - public String encode(byte[] bytes) - { - try - { - return new String(Base64.encodeBase64(bytes), "UTF-8"); - } - catch (UnsupportedEncodingException e) - { - throw new OAuthSignatureException("Can't perform base64 encoding", e); - } - } - - @Override - public String getType() - { - return "CommonsCodec"; - } - - public static boolean isPresent() - { - try - { - Class.forName("org.apache.commons.codec.binary.Base64"); - return true; - } - catch (ClassNotFoundException e) - { - return false; - } - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/DatatypeConverterEncoder.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/DatatypeConverterEncoder.java deleted file mode 100644 index 62fa5b352..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/DatatypeConverterEncoder.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -import javax.xml.bind.*; - -public class DatatypeConverterEncoder extends Base64Encoder -{ - @Override - public String encode(byte[] bytes) - { - return DatatypeConverter.printBase64Binary(bytes); - } - - @Override - public String getType() - { - return "DatatypeConverter"; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/HMACSha1SignatureService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/HMACSha1SignatureService.java deleted file mode 100644 index b4a425fbb..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/HMACSha1SignatureService.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -import javax.crypto.*; -import javax.crypto.spec.*; - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -/** - * HMAC-SHA1 implementation of {@SignatureService} - * - * @author Pablo Fernandez - * - */ -public class HMACSha1SignatureService implements SignatureService -{ - private static final String EMPTY_STRING = ""; - private static final String CARRIAGE_RETURN = "\r\n"; - private static final String UTF8 = "UTF-8"; - private static final String HMAC_SHA1 = "HmacSHA1"; - private static final String METHOD = "HMAC-SHA1"; - - /** - * {@inheritDoc} - */ - public String getSignature(String baseString, String apiSecret, String tokenSecret) - { - try - { - Preconditions.checkEmptyString(baseString, "Base string cant be null or empty string"); - Preconditions.checkEmptyString(apiSecret, "Api secret cant be null or empty string"); - return doSign(baseString, HttpEncoder.encode(apiSecret) + '&' + HttpEncoder.encode(tokenSecret)); - } - catch (Exception e) - { - throw new OAuthSignatureException(baseString, e); - } - } - - private String doSign(String toSign, String keyString) throws Exception - { - SecretKeySpec key = new SecretKeySpec((keyString).getBytes(UTF8), HMAC_SHA1); - Mac mac = Mac.getInstance(HMAC_SHA1); - mac.init(key); - byte[] bytes = mac.doFinal(toSign.getBytes(UTF8)); - return bytesToBase64String(bytes).replace(CARRIAGE_RETURN, EMPTY_STRING); - } - - private String bytesToBase64String(byte[] bytes) - { - return Base64Encoder.getInstance().encode(bytes); - } - - /** - * {@inheritDoc} - */ - public String getSignatureMethod() - { - return METHOD; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/PlaintextSignatureService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/PlaintextSignatureService.java deleted file mode 100644 index a8aaeacb0..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/PlaintextSignatureService.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - - -import org.maxkey.client.oauth.exceptions.*; -import org.maxkey.client.utils.HttpEncoder; -import org.maxkey.client.utils.Preconditions; - -/** - * plaintext implementation of {@SignatureService} - * - * @author Pablo Fernandez - * - */ -public class PlaintextSignatureService implements SignatureService -{ - private static final String METHOD = "PLAINTEXT"; - - /** - * {@inheritDoc} - */ - public String getSignature(String baseString, String apiSecret, String tokenSecret) - { - try - { - Preconditions.checkEmptyString(apiSecret, "Api secret cant be null or empty string"); - return HttpEncoder.encode(apiSecret) + '&' + HttpEncoder.encode(tokenSecret); - } - catch (Exception e) - { - throw new OAuthSignatureException(baseString, e); - } - } - - /** - * {@inheritDoc} - */ - public String getSignatureMethod() - { - return METHOD; - } -} - diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/RSASha1SignatureService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/RSASha1SignatureService.java deleted file mode 100644 index 7cbd95c0e..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/RSASha1SignatureService.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -import java.security.*; - -import org.maxkey.client.oauth.exceptions.*; - -/** - * A signature service that uses the RSA-SHA1 algorithm. - */ -public class RSASha1SignatureService implements SignatureService -{ - private static final String METHOD = "RSA-SHA1"; - private static final String RSA_SHA1 = "SHA1withRSA"; - private static final String UTF8 = "UTF-8"; - - private PrivateKey privateKey; - - public RSASha1SignatureService(PrivateKey privateKey) - { - this.privateKey = privateKey; - } - - /** - * {@inheritDoc} - */ - public String getSignature(String baseString, String apiSecret, String tokenSecret) - { - try - { - Signature signature = Signature.getInstance(RSA_SHA1); - signature.initSign(privateKey); - signature.update(baseString.getBytes(UTF8)); - return bytesToBase64String(signature); - } - catch (Exception e) - { - throw new OAuthSignatureException(baseString, e); - } - } - - private String bytesToBase64String(Signature signature) throws SignatureException - { - return Base64Encoder.getInstance().encode(signature.sign()); - } - - /** - * {@inheritDoc} - */ - public String getSignatureMethod() - { - return METHOD; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/SignatureService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/SignatureService.java deleted file mode 100644 index f457dacd5..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/SignatureService.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -/** - * Signs a base string, returning the OAuth signature - * - * @author Pablo Fernandez - * - */ -public interface SignatureService -{ - /** - * Returns the signature - * - * @param baseString url-encoded string to sign - * @param apiSecret api secret for your app - * @param tokenSecret token secret (empty string for the request token step) - * - * @return signature - */ - public String getSignature(String baseString, String apiSecret, String tokenSecret); - - /** - * Returns the signature method/algorithm - * - * @return - */ - public String getSignatureMethod(); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampService.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampService.java deleted file mode 100644 index 201c6b765..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampService.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -/** - * Unix epoch timestamp generator. - * - * This class is useful for stubbing in tests. - * - * @author Pablo Fernandez - */ -public interface TimestampService -{ - /** - * Returns the unix epoch timestamp in seconds - * - * @return timestamp - */ - public String getTimestampInSeconds(); - - /** - * Returns a nonce (unique value for each request) - * - * @return nonce - */ - public String getNonce(); -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampServiceImpl.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampServiceImpl.java deleted file mode 100644 index 46125a5a2..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/oauth/services/TimestampServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.services; - -import java.util.*; - -/** - * Implementation of {@link TimestampService} using plain java classes. - * - * @author Pablo Fernandez - */ -public class TimestampServiceImpl implements TimestampService -{ - private Timer timer; - - /** - * Default constructor. - */ - public TimestampServiceImpl() - { - timer = new Timer(); - } - - /** - * {@inheritDoc} - */ - public String getNonce() - { - Long ts = getTs(); - return String.valueOf(ts + timer.getRandomInteger()); - } - - /** - * {@inheritDoc} - */ - public String getTimestampInSeconds() - { - return String.valueOf(getTs()); - } - - private Long getTs() - { - return timer.getMilis() / 1000; - } - - void setTimer(Timer timer) - { - this.timer = timer; - } - - /** - * Inner class that uses {@link System} for generating the timestamps. - * - * @author Pablo Fernandez - */ - static class Timer - { - private final Random rand = new Random(); - Long getMilis() - { - return System.currentTimeMillis(); - } - - Integer getRandomInteger() - { - return rand.nextInt(); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java deleted file mode 100644 index 47a977082..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -/** - * @author Administrator - * - */ -package org.maxkey.client; diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/tokenbase/TokenUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/tokenbase/TokenUtils.java deleted file mode 100644 index 41ee5c186..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/tokenbase/TokenUtils.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.tokenbase; - -import java.io.UnsupportedEncodingException; -import java.util.HashMap; - -import org.apache.commons.codec.DecoderException; -import org.apache.commons.codec.binary.Hex; -import org.maxkey.client.crypto.Base64Utils; -import org.maxkey.client.crypto.ReciprocalUtils; -import org.maxkey.client.utils.JsonUtils; - -public class TokenUtils { - - public static String decode(String tokenString,String algorithmKey, String algorithm){ - String token=ReciprocalUtils.decoder(Base64Utils.base64UrlDecode(tokenString), algorithmKey, algorithm); - - - try { - token=new String(Hex.decodeHex(token.toCharArray()),"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (DecoderException e) { - e.printStackTrace(); - } - - return token; - } - - public static String [] parseSimpleBasedToken(String token){ - return new String[] {token.substring(0, token.indexOf("@@")), - token.substring(token.indexOf("@@")+2)}; - } - - @SuppressWarnings("unchecked") - public static HashMap parseJsonBasedToken(String token){ - HashMap tokenMap=new HashMap(); - - tokenMap=JsonUtils.gson2Object(token, tokenMap.getClass()); - - return tokenMap; - } - - public static void main(String[] args) { - // TODO Auto-generated method stub - String token="634d23bf64c20ae937eb9b81dbe9c30969d2d569c8c6c3b9d8089bff8c910c07722ca1f4137132fefb380fb8dd011e71e5b1df84b73088629b85f07a3559c7d9"; - // ZpqjxUOX3QuE8rwl6etstU0z2WO%2Flpo5 - String tokenString=TokenUtils.decode(token, "x8zPbCya", ReciprocalUtils.Algorithm.DES); - System.out.println(tokenString); - - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/JsonUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/JsonUtils.java deleted file mode 100644 index c1ffc8f36..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/JsonUtils.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -public class JsonUtils { - - - /** - * Transform json string to java bean object use Gson - * @param - * @param json - * @param Class - * @return Object - */ - - public static T gson2Object(String json,Class cls){ - T newBean = (new Gson()).fromJson(json, cls); - return newBean; - } - - - /** - * Transform java bean object to json string use Gson - * @param bean - * @return string - */ - public static String gson2Json(Object bean){ - String json=""; - // convert java object to JSON format, - // and returned as JSON formatted string - json = (new Gson()).toJson(bean); - - return json; - } - - /** - * prettyJson use Gson - * @param bean - * @return String - */ - public static String gsonPretty(Object bean){ - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - String json = gson.toJson(bean); - return json; - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/MapUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/MapUtils.java deleted file mode 100644 index f9370feee..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/MapUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - -import java.util.Map; - -public abstract class MapUtils { - - public static String toString(Map map) { - if (map == null) { - return ""; - } - if (map.isEmpty()) { - return "{}"; - } - - final StringBuilder result = new StringBuilder(); - for (Map.Entry entry : map.entrySet()) { - result.append(", ") - .append(entry.getKey().toString()) - .append(" -> ") - .append(entry.getValue().toString()) - .append(' '); - } - return "{" + result.append('}').substring(1); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/PathUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/PathUtils.java deleted file mode 100644 index 7db2b1b7a..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/PathUtils.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - -import java.io.UnsupportedEncodingException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class PathUtils { - private final Log log = LogFactory.getLog(getClass()); - private static PathUtils instance = null; - private String classPath; - - public static synchronized PathUtils getInstance() { - if (instance == null) { - instance = new PathUtils(); - instance.log.debug("getInstance()" +" new ConfigFile instance"); - } - return instance; - } - - public PathUtils() { - try { - classPath = java.net.URLDecoder.decode(PathUtils.class.getResource("PathUtilsFile.properties").getFile(),"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - String fileProtocol=PathUtils.class.getResource("PathUtilsFile.properties").getProtocol(); - log.info("getWebRoot getProtocol:"+PathUtils.class.getResource("PathUtilsFile.properties").getProtocol()); - if(fileProtocol.equalsIgnoreCase("file")){ - // /D:/SoftWare/apache-tomcat-5.5.30/webapps/app - if(classPath.indexOf("file:")==0){ - classPath=classPath.substring(5, classPath.length()); - } - }else if(fileProtocol.equalsIgnoreCase("jar")){ - // file:/D:/SoftWare/apache-tomcat-5.5.30/webapps/app - if(classPath.indexOf("file:")==0){ - classPath=classPath.substring(5, classPath.length()); - } - }else if(fileProtocol.equalsIgnoreCase("wsjar")){ - if(classPath.indexOf("file:")==0){ - classPath=classPath.substring(5, classPath.length()); - } - }else if(classPath.equalsIgnoreCase("file:")){ - classPath=classPath.substring(5, classPath.length()); - } - - /// /WEB-INF/ - if(classPath.indexOf("/WEB-INF/")!=-1){ - classPath=classPath.substring(0, classPath.indexOf("/WEB-INF/")); - } - - log.info("getWebRoot() webApp root Path : "+classPath); - } - - public String getWebInf(){ - return classPath+"/WEB-INF/"; - } - - - public String getClassPath(){ - return classPath+"/WEB-INF/classes/"; - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/Preconditions.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/Preconditions.java deleted file mode 100644 index 3ed0f5c4b..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/Preconditions.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - -import java.util.Locale; -import java.util.regex.Pattern; - -import org.maxkey.client.oauth.model.OAuthConstants; - -/** - * Utils for checking preconditions and invariants - */ -public abstract class Preconditions { - - private static final String DEFAULT_MESSAGE = "Received an invalid parameter"; - - // scheme = alpha *( alpha | digit | "+" | "-" | "." ) - private static final String URL_REGEXP = "^[a-zA-Z][a-zA-Z0-9+.-]*://\\S+"; - - /** - * Checks that an object is not null. - * - * @param object any object - * @param errorMsg error message - * - * @throws IllegalArgumentException if the object is null - */ - public static void checkNotNull(Object object, String errorMsg) { - check(object != null, errorMsg); - } - - /** - * Checks that a string is not null or empty - * - * @param string any string - * @param errorMsg error message - * - * @throws IllegalArgumentException if the string is null or empty - */ - public static void checkEmptyString(String string, String errorMsg) { - check(string != null && !string.trim().isEmpty(), errorMsg); - } - - /** - * Checks that a URL is valid - * - * @param url any string - * @param errorMsg error message - */ - public static void checkValidUrl(String url, String errorMsg) { - checkEmptyString(url, errorMsg); - check(isUrl(url), errorMsg); - } - - /** - * Checks that a URL is a valid OAuth callback - * - * @param url any string - * @param errorMsg error message - */ - public static void checkValidOAuthCallback(String url, String errorMsg) { - checkEmptyString(url, errorMsg); - if (url.toLowerCase(Locale.getDefault()).compareToIgnoreCase(OAuthConstants.OUT_OF_BAND) != 0) { - check(isUrl(url), errorMsg); - } - } - - private static boolean isUrl(String url) { - return Pattern.compile(URL_REGEXP).matcher(url).matches(); - } - - private static void check(boolean requirements, String error) { - if (!requirements) { - throw new IllegalArgumentException(error == null || error.trim().length() <= 0 ? DEFAULT_MESSAGE : error); - } - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StreamUtils.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StreamUtils.java deleted file mode 100644 index 9a8d67c09..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StreamUtils.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.zip.GZIPInputStream; - -/** - * Utils to deal with Streams. - */ -public abstract class StreamUtils { - - /** - * Returns the stream contents as an UTF-8 encoded string - * - * @param is input stream - * @return string contents - * @throws java.io.IOException in any. SocketTimeout in example - */ - public static String getStreamContents(InputStream is) throws IOException { - Preconditions.checkNotNull(is, "Cannot get String from a null object"); - final char[] buffer = new char[0x10000]; - final StringBuilder out = new StringBuilder(); - try (Reader in = new InputStreamReader(is, "UTF-8")) { - int read; - do { - read = in.read(buffer, 0, buffer.length); - if (read > 0) { - out.append(buffer, 0, read); - } - } while (read >= 0); - } - return out.toString(); - } - - /** - * Return String content from a gzip stream - * - * @param is input stream - * @return string contents - * @throws java.io.IOException in any. SocketTimeout in example - */ - public static String getGzipStreamContents(InputStream is) throws IOException { - Preconditions.checkNotNull(is, "Cannot get String from a null object"); - final GZIPInputStream gis = new GZIPInputStream(is); - return getStreamContents(gis); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StringGenerator.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StringGenerator.java deleted file mode 100644 index b564b74c8..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/StringGenerator.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - -import java.lang.management.ManagementFactory; -import java.security.SecureRandom; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Random; -import java.util.UUID; - -import org.maxkey.client.crypto.Base64Utils; - -public class StringGenerator { - - private static final int MAX_PID = 65536; - - private char[] DEFAULT_CODEC = "1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toCharArray(); - - public static final char[] DEFAULT_CODE_NUMBER = "1234567890".toCharArray(); - - public static final char[] DEFAULT_CODE_LOWERCASE = "abcdefghijklmnopqrstuvwxyz".toCharArray(); - - public static final char[] DEFAULT_CODE_UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray(); - - public static final char[] DEFAULT_CODE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toCharArray(); - - public static final char[] DEFAULT_CODE_NUMBER_LETTERS = "1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toCharArray(); - - public static int processId; - - private static final String uuidRegex = "^[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}$"; - - - private Random random = new SecureRandom(); - - private int length; - - static { - final String jvmName = ManagementFactory.getRuntimeMXBean().getName(); - int index = jvmName.indexOf('@'); - if (index < 1) - throw new RuntimeException("Could not get PID"); - - try { - processId= Integer.parseInt(jvmName.substring(0, index)) % MAX_PID; - } catch (NumberFormatException e) { - throw new RuntimeException("Could not get PID"); - } - } - - /** - * Create a generator with the default length (6). - */ - public StringGenerator() { - this(6); - } - - /** - * Create a generator of random strings of the length provided - * - * @param length the length of the strings generated - */ - public StringGenerator(int length) { - this.length = length; - } - - public StringGenerator(char[] defaultCode,int length) { - this.DEFAULT_CODEC=defaultCode; - this.length = length; - } - - public String randomGenerate() { - byte[] verifierBytes = new byte[length]; - random.nextBytes(verifierBytes); - return getString(verifierBytes); - } - - public String uuidGenerate() { - return UUID.randomUUID().toString().toLowerCase(); - } - - public String uniqueGenerate() { - StringBuffer uniqueString=new StringBuffer(""); - - this.length=9; - String randomString =randomGenerate(); - uniqueString.append(randomString.subSequence(0, 4)); - - Date currentDate=new Date(); - DateFormat dateFormat = new SimpleDateFormat("ddMMyyyyHHmmssSSS"); - String dateString=Base64Utils.encodeBase64(dateFormat.format(currentDate).getBytes()); - dateString=dateString.substring(0, dateString.length()-1); - uniqueString.append(dateString); - - uniqueString.append(randomString.subSequence(5, 8)); - - return uniqueString.toString(); - } - - /** - * Convert these random bytes to a verifier string. The length of the byte array can be - * {@link #setLength(int) configured}. The default implementation mods the bytes to fit into the - * ASCII letters 1-9, A-Z, a-z . - * - * @param verifierBytes The bytes. - * @return The string. - */ - protected String getString(byte[] verifierBytes) { - char[] chars = new char[verifierBytes.length]; - for (int i = 0; i < verifierBytes.length; i++) { - chars[i] = DEFAULT_CODEC[((verifierBytes[i] & 0xFF) % DEFAULT_CODEC.length)]; - } - return new String(chars); - } - - /** - * The random value generator used to create token secrets. - * - * @param random The random value generator used to create token secrets. - */ - public void setRandom(Random random) { - this.random = random; - } - - /** - * The length of string to generate. - * - * @param length the length to set - */ - public void setLength(int length) { - this.length = length; - } - - - public static boolean uuidMatches(String uuidString) { - return uuidString.matches(uuidRegex); - } - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java deleted file mode 100644 index a8fc21795..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/AuthenticationFilter.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.web.authn; - -import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.maxkey.client.oauth.OAuthClient; -import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.MaxkeyApi20; -import org.maxkey.client.oauth.domain.UserInfo; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.oauth.model.Verifier; -import org.maxkey.client.oauth.oauth.OAuthService; - - - -/** - * - * @author Crystal.Sea - */ -public class AuthenticationFilter implements Filter { - - private static Log log = LogFactory.getLog(AuthenticationFilter. class ); - - private static final String UUID_REGEX = "^[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}$"; - - public static final String CONST_MAXKEY_USERINFO="CONST_MAXKEY_USERINFO"; - - private String clientId; - private String clientSecret; - private String callBackUri; - private boolean enable; - private OAuthService service ; - - public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException { - - HttpServletRequest httpServletRequest = (HttpServletRequest) request; - HttpServletResponse httpServletResponse = (HttpServletResponse) response; - HttpSession session = httpServletRequest.getSession(); - - if(enable){ - Token EMPTY_TOKEN = null; - String code=request.getParameter("code"); - - if(code!=null&&uuidMatches(code)){ - Verifier verifier = new Verifier(code); - Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier); - log.debug(" access token is "+accessToken); - - OAuthClient restClient=new OAuthClient(OAuthClient.OAUTH_V20_USERINFO_URI); - - UserInfo userInfo=restClient.getUserInfo(accessToken.getToken()); - - session.setAttribute(CONST_MAXKEY_USERINFO, userInfo); - - }else if(session.getAttribute(CONST_MAXKEY_USERINFO)==null){ - String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN); - log.debug("Redirect to authorization Url : "+authorizationUrl); - httpServletResponse.sendRedirect(authorizationUrl); - } - } - - chain.doFilter(request, response); - } - - public void destroy() { - this.destroy(); - } - - public void init(FilterConfig config) throws ServletException { - this.clientId=config.getInitParameter("clientId"); - this.clientSecret=config.getInitParameter("clientSecret"); - this.callBackUri=config.getInitParameter("callBackUri"); - this.enable=config.getInitParameter("enable").equalsIgnoreCase("true"); - - log.debug("client_id : "+clientId); - log.debug("client_secret : "+clientSecret); - log.debug("callBack Uri : "+callBackUri); - log.debug("enable : "+enable); - - service = new ServiceBuilder() - .provider(MaxkeyApi20.class) - .apiKey(this.clientId) - .apiSecret(this.clientSecret) - .callback(this.callBackUri) - .build(); - log.debug(" init."); - } - - public static boolean uuidMatches(String uuidString) { - return uuidString.matches(UUID_REGEX); - } -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/SingleSignOutFilter.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/SingleSignOutFilter.java deleted file mode 100644 index 144d5919d..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/web/authn/SingleSignOutFilter.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.web.authn; - -import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * - * @author Crystal.Sea - */ -public class SingleSignOutFilter implements Filter { - private static final Logger log = LoggerFactory.getLogger(SingleSignOutFilter.class); - private String singleSignOutEndpoint; - - public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException { - - HttpServletRequest httpServletRequest = (HttpServletRequest) request; - HttpServletResponse httpServletResponse = (HttpServletResponse) response; - - HttpSession session = httpServletRequest.getSession(); - session.removeAttribute(AuthenticationFilter.CONST_MAXKEY_USERINFO); - session.invalidate(); - - httpServletResponse.sendRedirect(singleSignOutEndpoint); - - chain.doFilter(request, response); - } - - public void destroy() { - this.destroy(); - } - - public void init(FilterConfig config) throws ServletException { - this.singleSignOutEndpoint=config.getInitParameter("singleSignOutEndpoint"); - log.debug(" init."); - } -} diff --git a/maxkey-client-sdk/src/main/resources/log4j.properties b/maxkey-client-sdk/src/main/resources/log4j.properties deleted file mode 100644 index d924d5179..000000000 --- a/maxkey-client-sdk/src/main/resources/log4j.properties +++ /dev/null @@ -1,40 +0,0 @@ -# General Log Settings -#log4j.rootLogger=INFO,LOGFILE,stdout -log4j.rootLogger=INFO,LOGFILE,stdout - -#appender config:stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n -#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n - -#appender config:LOGFILE -# log file arrcoss file size -log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender -#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender -#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd -log4j.appender.LOGFILE.File=${catalina.home}/logs/maxkey_client_out.log -log4j.appender.LOGFILE.maxFileSize=2048KB -log4j.appender.LOGFILE.MaxBackupIndex = 5 - -log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n - -log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender -log4j.appender.DEBUG.File=${catalina.home}/logs/maxkey_client_debug.log -log4j.appender.DEBUG.maxFileSize=2048KB -log4j.appender.DEBUG.MaxBackupIndex = 5 -log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd -log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout -log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n - -#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender -#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd -log4j.appender.ERROR=org.apache.log4j.RollingFileAppender -log4j.appender.ERROR.File=${catalina.home}/logs/maxkey_client_error.log - -log4j.appender.ERROR.maxFileSize=2048KB -log4j.appender.ERROR.MaxBackupIndex = 5 - -log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout -log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n diff --git a/maxkey-client-sdk/src/main/resources/org/maxkey/client/utils/PathUtilsFile.properties b/maxkey-client-sdk/src/main/resources/org/maxkey/client/utils/PathUtilsFile.properties deleted file mode 100644 index 6a2b0ac42..000000000 --- a/maxkey-client-sdk/src/main/resources/org/maxkey/client/utils/PathUtilsFile.properties +++ /dev/null @@ -1 +0,0 @@ -v1.0.1 \ No newline at end of file diff --git a/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxKey20Example.java b/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxKey20Example.java deleted file mode 100644 index f9bf63083..000000000 --- a/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxKey20Example.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.test; - -import java.util.*; - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.MaxkeyApi20; -import org.maxkey.client.oauth.model.OAuthRequest; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.oauth.model.Verifier; -import org.maxkey.client.oauth.oauth.OAuthService; - -public class MaxKey20Example -{ - private static final String NETWORK_NAME = "SinaWeibo"; - private static final String PROTECTED_RESOURCE_URL = "https://api.weibo.com/2/account/get_uid.json"; - private static final Token EMPTY_TOKEN = null; - - public static void main(String[] args) - { - // Replace these with your own api key and secret - String apiKey = "your_api_key"; - String apiSecret = "your_api_secret"; - OAuthService service = new ServiceBuilder() - .provider(MaxkeyApi20.class) - .apiKey(apiKey) - .apiSecret(apiSecret) - .callback("http://www.dajie.com/oauth/sina") - .build(); - Scanner in = new Scanner(System.in); - - System.out.println("=== " + NETWORK_NAME + "'s OAuth Workflow ==="); - System.out.println(); - - // Obtain the Authorization URL - System.out.println("Fetching the Authorization URL..."); - String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN); - System.out.println("Got the Authorization URL!"); - System.out.println("Now go and authorize Scribe here:"); - System.out.println(authorizationUrl); - System.out.println("And paste the authorization code here"); - System.out.print(">>"); - Verifier verifier = new Verifier(in.nextLine()); - System.out.println(); - - // Trade the Request Token and Verifier for the Access Token - System.out.println("Trading the Request Token for an Access Token..."); - Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier); - System.out.println("Got the Access Token!"); - System.out.println("(if your curious it looks like this: " + accessToken + " )"); - System.out.println(); - - // Now let's go and ask for a protected resource! - System.out.println("Now we're going to access a protected resource..."); - OAuthRequest request = new OAuthRequest(HttpVerb.GET, PROTECTED_RESOURCE_URL); - service.signRequest(accessToken, request); - Response response = request.send(); - System.out.println("Got it! Lets see what we found..."); - System.out.println(); - System.out.println(response.getCode()); - System.out.println(response.getBody()); - - System.out.println(); - System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); - - } -} diff --git a/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxkeyPasswordDemo.java b/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxkeyPasswordDemo.java deleted file mode 100644 index 1ca8a94f6..000000000 --- a/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/MaxkeyPasswordDemo.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.oauth.test; - -import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.builder.api.MaxkeyPasswordApi20; -import org.maxkey.client.oauth.model.OAuthConfig; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.oauth.oauth.OAuthPasswordService; - -public class MaxkeyPasswordDemo { - - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - - String accessTokenUrl="http://localhost:8080/opensec/oauth/v20/token"; - String clientId = "e6bfadbfc1d64d0e9140a716548c35db"; - String clientSerect = "e6bfadbfc1d64d0e9140a716548c35db"; - - String callback = "http://localhost:8080/oauth1demo/oauth20callback.jsp"; - String responseType ="token"; - String approvalprompt = "auto"; - OAuthConfig oauthServiceConfig=new OAuthConfig(clientId,clientSerect,callback); - - MaxkeyPasswordApi20 ConnsecPasswordApi20=new MaxkeyPasswordApi20(accessTokenUrl); - - OAuthPasswordService oAuthPasswordService=new OAuthPasswordService(oauthServiceConfig,ConnsecPasswordApi20); - Token accessToken = null; - Response response = null; - accessToken = oAuthPasswordService.getAccessToken("6ac07a3d-b935-43f2-a693-9ce49b6695b7", "1qaz2wsx"); - - } - - -} diff --git a/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/package-info.java b/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/package-info.java deleted file mode 100644 index dd633e524..000000000 --- a/maxkey-client-sdk/src/test/java/org/maxkey/client/oauth/test/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -/** - * @author Administrator - * - */ -package org.maxkey.client.oauth.test; diff --git a/maxkey-client-sdk/src/test/java/org/maxkey/client/utils/URLTest.java b/maxkey-client-sdk/src/test/java/org/maxkey/client/utils/URLTest.java deleted file mode 100644 index 42cc41532..000000000 --- a/maxkey-client-sdk/src/test/java/org/maxkey/client/utils/URLTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.client.utils; - -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; - -public class URLTest { - - /** - * @param args - * @throws UnsupportedEncodingException - */ - public static void main(String[] args) throws UnsupportedEncodingException { - // TODO Auto-generated method stub - //String encoderString="/bi/QvAJAXZfc/opendoc.htm?document=康缘药业经营决策分析 .qvw&host=QVS@bi-server51"; - - String encoderString="康缘药业经营决策分析 .qvw"; - encoderString=URLEncoder.encode(encoderString,"UTF-8"); - System.out.println(encoderString); - - String decoderString="/bi/QvAJAXZfc/opendoc.htm?document=%E5%BA%B7%E7%BC%98%E8%8D%AF%E4%B8%9A%E7%BB%8F%E8%90%A5%E5%86%B3%E7%AD%96%E5%88%86%E6%9E%90.qvw&host=QVS%40bi-server51"; - decoderString=URLDecoder.decode(decoderString,"UTF-8"); - System.out.println(decoderString); - - } - -} diff --git a/maxkey-client-sdk/src/test/java/org/maxkey/client/utils/package-info.java b/maxkey-client-sdk/src/test/java/org/maxkey/client/utils/package-info.java deleted file mode 100644 index d7d379089..000000000 --- a/maxkey-client-sdk/src/test/java/org/maxkey/client/utils/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -/** - * @author Administrator - * - */ -package org.maxkey.client.utils; diff --git a/maxkey-client-sdk/src/test/java/org/maxkey/rest/RestClientTest.java b/maxkey-client-sdk/src/test/java/org/maxkey/rest/RestClientTest.java deleted file mode 100644 index d81188335..000000000 --- a/maxkey-client-sdk/src/test/java/org/maxkey/rest/RestClientTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.rest; - -import java.util.HashMap; - -import org.junit.Test; -import org.maxkey.client.oauth.OAuthClient; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.utils.JsonUtils; - - -public class RestClientTest { - - //@Test - public void main() { - - - OAuthClient tokenRestClient=new OAuthClient("https://exmail.qq.com/cgi-bin/token"); - tokenRestClient.addParameter("grant_type", "client_credentials"); - tokenRestClient.addBasicAuthorization("maxkey", "66199e4c36b6dfcfb6f1ebceda789432"); - Token token =tokenRestClient.requestAccessToken(); - System.out.println(token); - - OAuthClient authkeyRestClient=new OAuthClient("http://openapi.exmail.qq.com:12211/openapi/mail/authkey"); - authkeyRestClient.addBearerAuthorization(token.getAccess_token()); - authkeyRestClient.addParameter("Alias", "test@maxkey.org"); - - - HashMap authKey=JsonUtils.gson2Object(authkeyRestClient.execute().getBody(), HashMap.class); - - String login_url="https://exmail.qq.com/cgi-bin/login?fun=bizopenssologin&method=bizauth&agent=%s&user=%s&ticket=%s"; - System.out.println(String.format(login_url, "connsec","test@maxkey.org",authKey.get("auth_key"))); - //https://exmail.qq.com/cgi-bin/login?fun=bizopenssologin&method=bizauth&agent=connsec&user=test@connsec.com&ticket=25640C491CA4A056BD1A936C6AA4ABBCAB13AE76EB80E6C3A9259F5E8BFD91D7EA05D10DA3FB18F9BFB445D104CB58A0B4CDE97D9F219F3C - } -} diff --git a/maxkey-connectors/.classpath b/maxkey-connectors/.classpath deleted file mode 100644 index eb19361b5..000000000 --- a/maxkey-connectors/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/.project b/maxkey-connectors/.project deleted file mode 100644 index a5cb9f4f0..000000000 --- a/maxkey-connectors/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - maxkey-connectors - Project maxkey-connectors created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.classpath b/maxkey-connectors/maxkey-connector-activedirectory/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.project b/maxkey-connectors/maxkey-connector-activedirectory/.project deleted file mode 100644 index 4e5ff56cb..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-activedirectory - Project maxkey-connectors-activedirectory created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.core.prefs b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8f838df8f..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=warning -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.launching.prefs b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index f8a131b56..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 2972a0e7e..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-activedirectory/build.gradle b/maxkey-connectors/maxkey-connector-activedirectory/build.gradle deleted file mode 100644 index 3c87c5618..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -description = "maxkey-connector-activedirectory" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-connectors:maxkey-connector-base") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/ActivedirectoryConsumerApplication.java b/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/ActivedirectoryConsumerApplication.java deleted file mode 100644 index f6468414b..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/ActivedirectoryConsumerApplication.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.constants.ConstantsProperties; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@PropertySource(ConstantsProperties.applicationPropertySource) -@SpringBootApplication -@ComponentScan(basePackages = { - "org.maxkey.connector", - "org.maxkey.connector.receiver", - "org.maxkey.connector.activedirectory" - }) -public class ActivedirectoryConsumerApplication { - - public static void main(String[] args) { - ConfigurableApplicationContext context = SpringApplication.run(ActivedirectoryConsumerApplication.class, args); - - } - - //@Bean(name = "activeDirectoryUtils") - public ActiveDirectoryUtils getLdapConnection( - @Value("${config.connector.activedirectory.providerUrl}") String providerUrl, - @Value("${config.connector.activedirectory.principal}") String principal, - @Value("${config.connector.activedirectory.credentials}") String credentials, - @Value("${config.connector.activedirectory.baseDN}") String baseDn, - @Value("${config.connector.activedirectory.domain}") String domain, - @Value("${config.connector.activedirectory.trustStore}") String trustStore, - @Value("${config.connector.activedirectory.trustStore.password}") String trustStorePassword - )throws Exception{ - ActiveDirectoryUtils ldapUtils=new ActiveDirectoryUtils( - providerUrl, - principal, - credentials, - baseDn, - domain); - - ldapUtils.setTrustStore(trustStore); - ldapUtils.setTrustStorePassword(trustStorePassword); - ldapUtils.setSsl(true); - - if(ldapUtils.openConnection()==null){ - throw new Exception("connection to Ldap Error."); - } - return ldapUtils; - } - -} diff --git a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Group2Activedirectory.java b/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Group2Activedirectory.java deleted file mode 100644 index 56ca7bf03..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Group2Activedirectory.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.activedirectory; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "groupConnector") -public class Group2Activedirectory extends GroupConnector { - private final static Logger logger = LoggerFactory.getLogger(Group2Activedirectory.class); - - ActiveDirectoryUtils ldapUtils; - - public Group2Activedirectory() { - // TODO Auto-generated constructor stub - } - @Override - public boolean create(Groups group) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - Attribute objectClass = new BasicAttribute("objectClass"); - objectClass.add("top"); - objectClass.add("group"); - attributes.put(objectClass); - - attributes.put(new BasicAttribute("cn",group.getName())); - attributes.put(new BasicAttribute("member","CN=dummy,"+ldapUtils.getBaseDN())); - - String dn="cn="+group.getName()+",cn=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+group.getName()+")", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(group); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(","), oldDn.length()); - - String groupName=dnSplit[0].split("=")[1]; - if(group.getName()!=groupName){ - String newDn="cn="+group.getName()+","+rdn; - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("cn",groupName)); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(Groups group) throws Exception { - logger.info("delete"); - try { - String dn="cn="+group.getName()+",cn=groups,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean addMember(GroupMember groupMember) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - Groups group =new Groups(); - group.setName(groupMember.getGroupName()); - return create(group); - } - - - String uniqueMember=""; - SearchControls memberSearchControls = new SearchControls(); - logger.debug("user Search : "+"(sAMAccountName="+groupMember.getMemberName()+")"); - memberSearchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration memberResults = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+groupMember.getMemberName()+")", memberSearchControls); - if (memberResults == null || !memberResults.hasMore()) { - - }else{ - SearchResult memberSr = (SearchResult) memberResults.next(); - uniqueMember =memberSr.getNameInNamespace(); - logger.debug("uniqueMember : "+uniqueMember); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.ADD_ATTRIBUTE,new BasicAttribute("member",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",cn=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - } - - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean deleteMember(GroupMember groupMember) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - return true; - } - - String uniqueMember=""; - SearchControls memberSearchControls = new SearchControls(); - memberSearchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration memberResults = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+groupMember.getMemberName()+")", memberSearchControls); - if (memberResults == null || !memberResults.hasMore()) { - - }else{ - SearchResult memberSr = (SearchResult) memberResults.next(); - uniqueMember =memberSr.getNameInNamespace(); - logger.debug("uniqueMember : "+uniqueMember); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("member",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",cn=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - -} diff --git a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Organization2Activedirectory.java b/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Organization2Activedirectory.java deleted file mode 100644 index 24ed0ef91..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Organization2Activedirectory.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.activedirectory; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "organizationConnector") -public class Organization2Activedirectory extends OrganizationConnector{ - private final static Logger logger = LoggerFactory.getLogger(Organization2Activedirectory.class); - - ActiveDirectoryUtils ldapUtils; - - public Organization2Activedirectory() { - // TODO Auto-generated constructor stub - } - - @Override - public boolean create(Organizations organization) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getParentId()+"))", constraints); - String rdn=""; - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","organizationalUnit")); - attributes.put(new BasicAttribute("ou",organization.getName())); - //attributes.put(new BasicAttribute("name",organization.getName())); - //attributes.put(new BasicAttribute("id",organization.getId())); - //attributes.put(new BasicAttribute("porgname",organization.getpName())); - //attributes.put(new BasicAttribute("porgid",organization.getpId())); - attributes.put(new BasicAttribute("description",organization.getId())); - - String dn="ou="+organization.getName()+","+rdn; - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - - } catch (NamingException e) { - e.printStackTrace(); - } - return super.create(organization); - } - - @Override - public boolean update(Organizations organization) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(organization); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(",")+1, oldDn.length()); - - String ouName=dnSplit[0].split("=")[1]; - if(organization.getName()!=ouName){ - String newDn="ou="+organization.getName()+","+rdn; - logger.debug("oldDn : "+oldDn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(oldDn, newDn); - - //ModificationItem[] modificationItems = new ModificationItem[1]; - //modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("ou",ouName)); - //modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("name",organization.getName())); - //ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return super.update(organization); - } - - @Override - public boolean delete(Organizations organization) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String dn=""; - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return super.delete(organization); - } - -} diff --git a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Password2Activedirectory.java b/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Password2Activedirectory.java deleted file mode 100644 index 02c69ba62..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/Password2Activedirectory.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.activedirectory; - -import java.io.UnsupportedEncodingException; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.PasswordConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "passwordConnector") -public class Password2Activedirectory extends PasswordConnector{ - private final static Logger logger = LoggerFactory.getLogger(Password2Activedirectory.class); - ActiveDirectoryUtils ldapUtils; - /** - * userAccountControl鍊煎緱璇存槑 - * http://support.microsoft.com/zh-cn/kb/305144 - * 灞炴�ф爣蹇� 鍗佸叚杩涘埗鍊� 鍗佽繘鍒跺�� - SCRIPT 0x0001 1 - ACCOUNTDISABLE 0x0002 2 - HOMEDIR_REQUIRED 0x0008 8 - LOCKOUT 0x0010 16 - PASSWD_NOTREQD 0x0020 32 - PASSWD_CANT_CHANGE 0x0040 64 - ENCRYPTED_TEXT_PWD_ALLOWED 0x0080 128 - TEMP_DUPLICATE_ACCOUNT 0x0100 256 - NORMAL_ACCOUNT 0x0200 512 - INTERDOMAIN_TRUST_ACCOUNT 0x0800 2048 - WORKSTATION_TRUST_ACCOUNT 0x1000 4096 - SERVER_TRUST_ACCOUNT 0x2000 8192 - DONT_EXPIRE_PASSWORD 0x10000 65536 - MNS_LOGON_ACCOUNT 0x20000 131072 - SMARTCARD_REQUIRED 0x40000 262144 - TRUSTED_FOR_DELEGATION 0x80000 524288 - NOT_DELEGATED 0x100000 1048576 - USE_DES_KEY_ONLY 0x200000 2097152 - DONT_REQ_PREAUTH 0x400000 4194304 - PASSWORD_EXPIRED 0x800000 8388608 - TRUSTED_TO_AUTH_FOR_DELEGATION 0x1000000 16777216 - */ - public Password2Activedirectory() { - - } - - @Override - public boolean sync(UserInfo userInfo) throws Exception{ - try { - String dn=null; - SearchControls searchControls = new SearchControls(); - searchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+userInfo.getUsername()+")", searchControls); - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ModificationItem[] modificationItems = new ModificationItem[1]; - logger.info("decipherable : "+userInfo.getDecipherable()); - String password=ReciprocalUtils.decoder(userInfo.getDecipherable()); - //modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("userPassword",password)); - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("unicodePwd",("\"" + password + "\"").getBytes("UTF-16LE"))); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/UserInfo2Activedirectory.java b/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/UserInfo2Activedirectory.java deleted file mode 100644 index eb45d4548..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/src/main/java/org/maxkey/connector/activedirectory/UserInfo2Activedirectory.java +++ /dev/null @@ -1,288 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.activedirectory; - -import java.io.UnsupportedEncodingException; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.ActiveDirectoryUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "userInfoConnector") -public class UserInfo2Activedirectory extends UserInfoConnector{ - private final static Logger logger = LoggerFactory.getLogger(UserInfo2Activedirectory.class); - ActiveDirectoryUtils ldapUtils; - /** - * userAccountControl值得说明 - * http://support.microsoft.com/zh-cn/kb/305144 - * 属�?�标�? 十六进制�? 十进制�?? - SCRIPT 0x0001 1 - ACCOUNTDISABLE 0x0002 2 - HOMEDIR_REQUIRED 0x0008 8 - LOCKOUT 0x0010 16 - PASSWD_NOTREQD 0x0020 32 - PASSWD_CANT_CHANGE 0x0040 64 - ENCRYPTED_TEXT_PWD_ALLOWED 0x0080 128 - TEMP_DUPLICATE_ACCOUNT 0x0100 256 - NORMAL_ACCOUNT 0x0200 512 - INTERDOMAIN_TRUST_ACCOUNT 0x0800 2048 - WORKSTATION_TRUST_ACCOUNT 0x1000 4096 - SERVER_TRUST_ACCOUNT 0x2000 8192 - DONT_EXPIRE_PASSWORD 0x10000 65536 - MNS_LOGON_ACCOUNT 0x20000 131072 - SMARTCARD_REQUIRED 0x40000 262144 - TRUSTED_FOR_DELEGATION 0x80000 524288 - NOT_DELEGATED 0x100000 1048576 - USE_DES_KEY_ONLY 0x200000 2097152 - DONT_REQ_PREAUTH 0x400000 4194304 - PASSWORD_EXPIRED 0x800000 8388608 - TRUSTED_TO_AUTH_FOR_DELEGATION 0x1000000 16777216 - */ - public UserInfo2Activedirectory() { - - } - - @Override - public boolean create(UserInfo userInfo) throws Exception{ - try { - Attributes attributes = new BasicAttributes(); - Attribute objectClass = new BasicAttribute("objectClass"); - objectClass.add("top"); - objectClass.add("person"); - objectClass.add("organizationalPerson"); - objectClass.add("user"); - attributes.put(objectClass); - attributes.put(new BasicAttribute("sAMAccountName",userInfo.getUsername())); - logger.debug("decipherable : "+userInfo.getDecipherable()); - String password=ReciprocalUtils.decoder(userInfo.getDecipherable()); - - attributes.put(new BasicAttribute("unicodePwd",("\"" + password + "\"").getBytes("UTF-16LE"))); - //attributes.put(new BasicAttribute("cn",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("cn",userInfo.getUsername())); - attributes.put(new BasicAttribute("displayName",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("givenName",userInfo.getGivenName())); - attributes.put(new BasicAttribute("sn",userInfo.getFamilyName())); - - attributes.put(new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"00000000000":userInfo.getWorkPhoneNumber())); - attributes.put(new BasicAttribute("mail",userInfo.getWorkEmail()==null?"email@default.com":userInfo.getWorkEmail())); - - attributes.put(new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"0":userInfo.getEmployeeNumber())); - attributes.put(new BasicAttribute("ou",userInfo.getDepartment()==null?"default":userInfo.getDepartment())); - String managerDn="CN=dummy,"+ldapUtils.getBaseDN(); - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - logger.debug("manager is null."); - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - SearchControls managerSearchControls = new SearchControls(); - managerSearchControls.setSearchScope(ldapUtils.getSearchScope()); - logger.debug("managerResults : "+ldapUtils.getBaseDN()); - logger.debug("filter : "+"(sAMAccountName="+manager.getUsername()+")"); - logger.debug("managerSearchControls : "+managerSearchControls); - NamingEnumeration managerResults = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+manager.getUsername()+")", managerSearchControls); - if (managerResults == null || !managerResults.hasMore()) { - - }else{ - SearchResult managerSr = (SearchResult) managerResults.next(); - managerDn =managerSr.getNameInNamespace(); - } - } - - attributes.put(new BasicAttribute("manager",managerDn)); - - attributes.put(new BasicAttribute("department",userInfo.getDepartment()==null?"default":userInfo.getDepartment())); - attributes.put(new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"default":userInfo.getDepartmentId())); - attributes.put(new BasicAttribute("title",userInfo.getJobTitle()==null?"default":userInfo.getJobTitle())); - - //for kerberos login - attributes.put(new BasicAttribute("servicePrincipalName",this.properties.getProperty("servicePrincipalName"))); - attributes.put(new BasicAttribute("userPrincipalName",userInfo.getUsername()+"@"+this.properties.getProperty("domain"))); - - attributes.put(new BasicAttribute("userAccountControl",Integer.toString(66048))); - String rdn=""; - if(userInfo.getDepartmentId()!=null&& - !userInfo.getDepartmentId().equals("")){ - //get organization dn - SearchControls searchControls = new SearchControls(); - searchControls.setSearchScope(ldapUtils.getSearchScope()); - logger.debug("managerResults : "+ldapUtils.getBaseDN()); - logger.debug("filter : "+"(&(objectClass=organizationalUnit)(description="+userInfo.getDepartmentId()+"))"); - logger.debug("searchControls : "+searchControls); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+userInfo.getDepartmentId()+"))", searchControls); - - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - }else{ - rdn=ldapUtils.getBaseDN(); - } - - //String dn="CN="+userInfo.getDisplayName()+","+rdn; - String dn="CN="+userInfo.getUsername()+","+rdn; - - logger.debug("dn : "+dn); - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - super.create(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - try { - String dn=null; - SearchControls searchControls = new SearchControls(); - searchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+userInfo.getUsername()+")", searchControls); - if (results == null || !results.hasMore()) { - return create(loadUser(userInfo)); - } - - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - - ModificationItem[] modificationItems = new ModificationItem[8]; - //modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("displayName",userInfo.getDisplayName())); - //modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("cn",userInfo.getDisplayName())); - //modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("givenName",userInfo.getGivenName())); - //modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("sn",userInfo.getFamilyName())); - - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"00000000000":userInfo.getWorkPhoneNumber())); - modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mail",userInfo.getWorkEmail()==null?"email@default.com":userInfo.getWorkEmail())); - - modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"default":userInfo.getEmployeeNumber())); - modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("ou",userInfo.getDepartment()==null?"default":userInfo.getDepartment())); - - modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("department",userInfo.getDepartmentId()==null?"default":userInfo.getDepartment())); - modificationItems[5]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"default":userInfo.getDepartmentId())); - modificationItems[6]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("title",userInfo.getJobTitle()==null?"default":userInfo.getJobTitle())); - - String managerDn="CN=dummy,"+ldapUtils.getBaseDN(); - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - SearchControls managerSearchControls = new SearchControls(); - managerSearchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration managerResults = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+manager.getUsername()+")", managerSearchControls); - if (managerResults == null || !managerResults.hasMore()) { - - }else{ - SearchResult managerSr = (SearchResult) managerResults.next(); - managerDn =managerSr.getNameInNamespace(); - } - } - - modificationItems[7]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("manager",managerDn)); - - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - - if(userInfo.getDepartmentId()!=null&& - !userInfo.getDepartmentId().equals("")){ - //get organization dn - SearchControls orgSearchControls = new SearchControls(); - orgSearchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration orgResults = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+userInfo.getDepartmentId()+"))", orgSearchControls); - String orgRdn=""; - if (orgResults == null || !orgResults.hasMore()) { - orgRdn=ldapUtils.getBaseDN(); - }else{ - SearchResult orgSearchResult = (SearchResult) orgResults.next(); - orgRdn =orgSearchResult.getNameInNamespace(); - } - - //String newDn="CN="+userInfo.getDisplayName()+","+orgRdn; - String newDn="CN="+userInfo.getUsername()+","+orgRdn; - - if(!dn.equals(newDn)){ - logger.debug("oldDn : "+dn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(dn, newDn); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - try { - String dn=null; - SearchControls searchControls = new SearchControls(); - searchControls.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(sAMAccountName="+userInfo.getUsername()+")", searchControls); - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - logger.debug("delete dn : "+dn); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - super.delete(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - - public UserInfo loadUser(UserInfo UserInfo) { - return null; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-activedirectory/src/main/resources/application.properties b/maxkey-connectors/maxkey-connector-activedirectory/src/main/resources/application.properties deleted file mode 100644 index 35fac8d5c..000000000 --- a/maxkey-connectors/maxkey-connector-activedirectory/src/main/resources/application.properties +++ /dev/null @@ -1,48 +0,0 @@ -#spring.profiles.active=dev -#application -application.title=MaxKey-Connector-ActiveDirectory -application.name=MaxKey-Connector-ActiveDirectory -application.formatted-version=v2.0.0 GA -#server port -server.port=9602 -#datasource -spring.datasource.username=root -spring.datasource.password=maxkey -spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - -spring.kafka.bootstrap-servers=localhost:9092 -###########【初始化消费者配置】########### -# 默认的消费组ID -spring.kafka.consumer.properties.group.id=ActiveDirectoryConsumerGroup -# 是否自动提交offset -spring.kafka.consumer.enable-auto-commit=true -# 提交offset延时(接收到消息后多久提交offset) -spring.kafka.consumer.auto.commit.interval.ms=1000 -# 当kafka中没有初始offset或offset超出范围时将自动重置offset -# earliest:重置为分区中最小的offset; -# latest:重置为分区中最新的offset(消费分区中新产生的数据); -# none:只要有一个分区不存在已提交的offset,就抛出异常; -spring.kafka.consumer.auto-offset-reset=latest -# 消费会话超时时间(超过这个时间consumer没有发送心跳,就会触发rebalance操作) -spring.kafka.consumer.properties.session.timeout.ms=120000 -# 消费请求超时时间 -spring.kafka.consumer.properties.request.timeout.ms=180000 -# Kafka提供的序列化和反序列化类 -spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer -spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer -# 消费端监听的topic不存在时，项目启动会报错(关掉) -spring.kafka.listener.missing-topics-fatal=false -# 设置批量消费 -# spring.kafka.listener.type=batch -# 批量消费每次最多消费多少条消息 -# spring.kafka.consumer.max-poll-records=50 - -config.connector.activedirectory.providerUrl=ldap:// -config.connector.activedirectory.principal=maxkey -config.connector.activedirectory.credentials=maxkey -config.connector.activedirectory.baseDN=dc=maxkey,dc=top -config.connector.activedirectory.domain=MAXKEY -config.connector.activedirectory.trustStore=maxkey -config.connector.activedirectory.trustStore.password=maxkey \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-base/.classpath b/maxkey-connectors/maxkey-connector-base/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-base/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-base/.project b/maxkey-connectors/maxkey-connector-base/.project deleted file mode 100644 index 17871f197..000000000 --- a/maxkey-connectors/maxkey-connector-base/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-base - Project maxkey-connectors-base created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.core.prefs b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8f838df8f..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=warning -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.launching.prefs b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index f8a131b56..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 9a5f7e0a8..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-base/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-base/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-base/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-base/build.gradle b/maxkey-connectors/maxkey-connector-base/build.gradle deleted file mode 100644 index d727ab605..000000000 --- a/maxkey-connectors/maxkey-connector-base/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -description = "maxkey-connector-base" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/AbstractConnector.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/AbstractConnector.java deleted file mode 100644 index b98d2ed2a..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/AbstractConnector.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import java.util.Properties; - -import org.springframework.jdbc.core.JdbcTemplate; - - -public abstract class AbstractConnector{ - - - public static class CONNECTOR_TYPE{ - public static int USERINFO_TYPE=1; - public static int ORG_TYPE=2; - public static int GROUP_TYPE=3; - public static int PASSWORD_TYPE=4; - } - - protected Properties properties; - - protected JdbcTemplate jdbcTemplate; - - public boolean create(T entity) throws Exception{ - return true; - } - - public boolean update(T entity) throws Exception{ - return true; - } - - public boolean delete(T entity) throws Exception{ - return true; - } - - public Properties getProperties() { - return properties; - } - - public void setProperties(Properties properties) { - this.properties = properties; - } - - public JdbcTemplate getJdbcTemplate() { - return jdbcTemplate; - } - - public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - - - -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/GroupConnector.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/GroupConnector.java deleted file mode 100644 index 750fd60e5..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/GroupConnector.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; - -public abstract class GroupConnector extends AbstractConnector { - - @Override - public boolean create(Groups group) throws Exception{ - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - return true; - } - - @Override - public boolean delete(Groups group) throws Exception{ - return true; - } - - - public boolean addMember(GroupMember groupMember) throws Exception{ - return true; - } - - - public boolean deleteMember(GroupMember groupMember) throws Exception{ - return true; - } - -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/OrganizationConnector.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/OrganizationConnector.java deleted file mode 100644 index dae99e550..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/OrganizationConnector.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.domain.Organizations; - -public abstract class OrganizationConnector extends AbstractConnector { - - @Override - public boolean create(Organizations organization) throws Exception{ - return true; - } - - @Override - public boolean update(Organizations organization) throws Exception{ - return true; - } - - @Override - public boolean delete(Organizations organization) throws Exception{ - return true; - } - -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/PasswordConnector.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/PasswordConnector.java deleted file mode 100644 index 11567f319..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/PasswordConnector.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.domain.UserInfo; - -public abstract class PasswordConnector extends AbstractConnector { - - public boolean sync(UserInfo userInfo) throws Exception{ - return true; - } - - - -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/UserInfoConnector.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/UserInfoConnector.java deleted file mode 100644 index 3da3c7323..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/UserInfoConnector.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.domain.UserInfo; - -public abstract class UserInfoConnector extends AbstractConnector { - - @Override - public boolean create(UserInfo userInfo) throws Exception { - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - return true; - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaGroupsTopicReceiver.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaGroupsTopicReceiver.java deleted file mode 100644 index aeffbb2fc..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaGroupsTopicReceiver.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.receiver; - -import java.util.Optional; - -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.Groups; -import org.maxkey.identity.kafka.KafkaIdentityAction; -import org.maxkey.identity.kafka.KafkaIdentityTopic; -import org.maxkey.identity.kafka.KafkaMessage; -import org.maxkey.util.JsonUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Component; - -@Component -public class KafkaGroupsTopicReceiver { - private static final Logger _logger = LoggerFactory.getLogger(KafkaGroupsTopicReceiver.class); - - @Autowired - GroupConnector groupConnector; - - @KafkaListener(topics = {KafkaIdentityTopic.GROUP_TOPIC}) - public void listen(ConsumerRecord record) { - try { - Optional kafkaMessage = Optional.ofNullable(record.value()); - - if (kafkaMessage.isPresent()) { - - Object message = kafkaMessage.get(); - - _logger.debug("----------------- record =" + record); - _logger.debug("------------------ message =" + message); - - KafkaMessage receiverMessage = JsonUtils.gson2Object(message.toString(), KafkaMessage.class); - Groups group = JsonUtils.gson2Object(receiverMessage.getContent().toString(),Groups.class); - - if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.CREATE_ACTION)) { - groupConnector.create(group); - }else if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.UPDATE_ACTION)) { - groupConnector.update(group); - }else if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.DELETE_ACTION)) { - groupConnector.delete(group); - }else{ - _logger.info("Other Action "); - } - } - }catch(Exception e) { - - } - - } -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaOrgsTopicReceiver.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaOrgsTopicReceiver.java deleted file mode 100644 index 596fc082e..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaOrgsTopicReceiver.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.receiver; - -import java.util.Optional; - -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.identity.kafka.KafkaIdentityAction; -import org.maxkey.identity.kafka.KafkaIdentityTopic; -import org.maxkey.identity.kafka.KafkaMessage; -import org.maxkey.util.JsonUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Component; - -@Component -public class KafkaOrgsTopicReceiver { - private static final Logger _logger = LoggerFactory.getLogger(KafkaOrgsTopicReceiver.class); - - @Autowired - OrganizationConnector organizationConnector; - - @KafkaListener(topics = {KafkaIdentityTopic.ORG_TOPIC}) - public void listen(ConsumerRecord record) { - try { - Optional kafkaMessage = Optional.ofNullable(record.value()); - - if (kafkaMessage.isPresent()) { - - Object message = kafkaMessage.get(); - - _logger.debug("----------------- record =" + record); - _logger.debug("------------------ message =" + message); - - KafkaMessage receiverMessage = JsonUtils.gson2Object(message.toString(), KafkaMessage.class); - Organizations org = JsonUtils.gson2Object(receiverMessage.getContent().toString(),Organizations.class); - - if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.CREATE_ACTION)) { - organizationConnector.create(org); - }else if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.UPDATE_ACTION)) { - organizationConnector.update(org); - }else if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.DELETE_ACTION)) { - organizationConnector.delete(org); - }else{ - _logger.info("Other Action "); - } - } - }catch(Exception e) { - - } - - } -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaPasswordTopicReceiver.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaPasswordTopicReceiver.java deleted file mode 100644 index 0491044ef..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaPasswordTopicReceiver.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.receiver; - -import java.util.Optional; - -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.maxkey.connector.PasswordConnector; -import org.maxkey.domain.UserInfo; -import org.maxkey.identity.kafka.KafkaIdentityAction; -import org.maxkey.identity.kafka.KafkaIdentityTopic; -import org.maxkey.identity.kafka.KafkaMessage; -import org.maxkey.util.JsonUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Component; - -@Component -public class KafkaPasswordTopicReceiver { - private static final Logger _logger = LoggerFactory.getLogger(KafkaPasswordTopicReceiver.class); - - @Autowired - PasswordConnector passwordConnector; - - @KafkaListener(topics = {KafkaIdentityTopic.PASSWORD_TOPIC}) - public void listen(ConsumerRecord record) { - try { - Optional kafkaMessage = Optional.ofNullable(record.value()); - - if (kafkaMessage.isPresent()) { - - Object message = kafkaMessage.get(); - - _logger.debug("----------------- record =" + record); - _logger.debug("------------------ message =" + message); - - KafkaMessage receiverMessage = JsonUtils.gson2Object(message.toString(), KafkaMessage.class); - UserInfo userInfo = JsonUtils.gson2Object(receiverMessage.getContent().toString(),UserInfo.class); - - if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.PASSWORD_ACTION)) { - passwordConnector.update(userInfo); - }else{ - _logger.info("Other Action "); - } - } - }catch(Exception e) { - - } - } -} diff --git a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaUserInfoTopicReceiver.java b/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaUserInfoTopicReceiver.java deleted file mode 100644 index 733cd0d55..000000000 --- a/maxkey-connectors/maxkey-connector-base/src/main/java/org/maxkey/connector/receiver/KafkaUserInfoTopicReceiver.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.receiver; - -import java.util.Optional; - -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.domain.UserInfo; -import org.maxkey.identity.kafka.KafkaIdentityAction; -import org.maxkey.identity.kafka.KafkaIdentityTopic; -import org.maxkey.identity.kafka.KafkaMessage; -import org.maxkey.util.JsonUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Component; - -@Component -public class KafkaUserInfoTopicReceiver { - private static final Logger _logger = LoggerFactory.getLogger(KafkaUserInfoTopicReceiver.class); - - @Autowired - UserInfoConnector userInfoConnector; - - @KafkaListener(topics = {KafkaIdentityTopic.USERINFO_TOPIC}) - public void listen(ConsumerRecord record) { - try { - Optional kafkaMessage = Optional.ofNullable(record.value()); - - if (kafkaMessage.isPresent()) { - - Object message = kafkaMessage.get(); - - _logger.debug("----------------- record =" + record); - _logger.debug("------------------ message =" + message); - - KafkaMessage receiverMessage = JsonUtils.gson2Object(message.toString(), KafkaMessage.class); - UserInfo userInfo = JsonUtils.gson2Object(receiverMessage.getContent().toString(),UserInfo.class); - - if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.CREATE_ACTION)) { - userInfoConnector.create(userInfo); - }else if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.UPDATE_ACTION)) { - userInfoConnector.update(userInfo); - }else if(receiverMessage.getActionType().equalsIgnoreCase(KafkaIdentityAction.DELETE_ACTION)) { - userInfoConnector.delete(userInfo); - }else{ - _logger.info("Other Action "); - } - } - }catch(Exception e) { - - } - - } -} diff --git a/maxkey-connectors/maxkey-connector-dingding/.classpath b/maxkey-connectors/maxkey-connector-dingding/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-dingding/.project b/maxkey-connectors/maxkey-connector-dingding/.project deleted file mode 100644 index 18d33e7b1..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-dingding - Project maxkey-connector-dingding created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 538fc0077..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-dingding/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-dingding/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-dingding/build.gradle b/maxkey-connectors/maxkey-connector-dingding/build.gradle deleted file mode 100644 index ea3de9070..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -description = "maxkey-connector-dingding" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-connectors:maxkey-connector-base") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/DingdingConsumerApplication.java b/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/DingdingConsumerApplication.java deleted file mode 100644 index ed8512c9c..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/DingdingConsumerApplication.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.constants.ConstantsProperties; -import org.maxkey.persistence.ldap.LdapUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@PropertySource(ConstantsProperties.applicationPropertySource) -@SpringBootApplication -@ComponentScan(basePackages = { - "org.maxkey.connector", - "org.maxkey.connector.receiver", - "org.maxkey.connector.dingding" - }) -public class DingdingConsumerApplication { - - public static void main(String[] args) { - // TODO Auto-generated method stub - ConfigurableApplicationContext context = SpringApplication.run(DingdingConsumerApplication.class, args); - - } - - //@Bean(name = "ldapUtils") - public LdapUtils getLdapConnection( - @Value("${config.connector.ldap.providerUrl}") String providerUrl, - @Value("${config.connector.ldap.principal}") String principal, - @Value("${config.connector.ldap.credentials}") String credentials, - @Value("${config.connector.ldap.baseDN}") String baseDn - )throws Exception{ - - LdapUtils ldapUtils=new LdapUtils( - providerUrl, - principal, - credentials, - baseDn); - if(ldapUtils.openConnection()==null){ - throw new Exception("connection to Ldap Error."); - } - return ldapUtils; - } - - - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(DingdingConsumerApplication.class); - } - -} diff --git a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Group2Dingding.java b/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Group2Dingding.java deleted file mode 100644 index e9406b2b2..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Group2Dingding.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.dingding; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "groupConnector") -public class Group2Dingding extends GroupConnector { - private final static Logger logger = LoggerFactory.getLogger(Group2Dingding.class); - - LdapUtils ldapUtils; - public Group2Dingding() { - - } - - @Override - public boolean create(Groups group) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","groupOfUniqueNames")); - attributes.put(new BasicAttribute("cn",group.getName())); - attributes.put(new BasicAttribute("uniqueMember","uid=dummy")); - - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+group.getName()+")", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(group); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(","), oldDn.length()); - - String groupName=dnSplit[0].split("=")[1]; - if(group.getName()!=groupName){ - String newDn="cn="+group.getName()+","+rdn; - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("cn",groupName)); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(Groups group) throws Exception { - logger.info("delete"); - try { - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean addMember(GroupMember groupMember) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - Groups group =new Groups(); - group.setName(groupMember.getGroupName()); - create(group); - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.ADD_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean deleteMember(GroupMember groupMember) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - return true; - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - - -} diff --git a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Organization2Dingding.java b/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Organization2Dingding.java deleted file mode 100644 index c4308de0f..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Organization2Dingding.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.dingding; - -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "organizationConnector") -public class Organization2Dingding extends OrganizationConnector{ - private final static Logger logger = LoggerFactory.getLogger(Organization2Dingding.class); - - LdapUtils ldapUtils; - public Organization2Dingding() { - - } - - @Override - public boolean create(Organizations organization) throws Exception { - logger.info("create"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getParentId()+"))", constraints); - String rdn=""; - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","organizationalUnit")); - attributes.put(new BasicAttribute("ou",organization.getName())); - //attributes.put(new BasicAttribute("name",organization.getName())); - //attributes.put(new BasicAttribute("id",organization.getId())); - //attributes.put(new BasicAttribute("porgname",organization.getpName())); - //attributes.put(new BasicAttribute("porgid",organization.getpId())); - attributes.put(new BasicAttribute("description",organization.getId())); - - String dn="ou="+organization.getName()+","+rdn; - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - - return super.create(organization); - } - - @Override - public boolean update(Organizations organization) throws Exception{ - logger.info("update"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(organization); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(",")+1, oldDn.length()); - - String ouName=dnSplit[0].split("=")[1]; - if(organization.getName()!=ouName){ - String newDn="ou="+organization.getName()+","+rdn; - logger.debug("oldDn : "+oldDn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("ou",ouName)); - //modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("name",organization.getName())); - //modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("id",organization.getId())); - //modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgname",organization.getpName())); - //modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgid",organization.getpId())); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - - return super.update(organization); - } - - @Override - public boolean delete(Organizations organization) throws Exception{ - logger.info("delete"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String dn=""; - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - - return super.delete(organization); - } - -} diff --git a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Password2Dingding.java b/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Password2Dingding.java deleted file mode 100644 index 4d1500efd..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/Password2Dingding.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.dingding; - -import javax.naming.NamingException; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; - -import org.maxkey.connector.PasswordConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - - -@Component(value = "passwordConnector") -public class Password2Dingding extends PasswordConnector{ - private final static Logger logger = LoggerFactory.getLogger(Password2Dingding.class); - - LdapUtils ldapUtils; - - public Password2Dingding() { - - } - - @Override - public boolean sync(UserInfo userInfo) throws Exception{ - logger.info("changePassword"); - try { - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/UserInfo2Dingding.java b/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/UserInfo2Dingding.java deleted file mode 100644 index 1f0a68d33..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/src/main/java/org/maxkey/connector/dingding/UserInfo2Dingding.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.dingding; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -@Component(value = "userInfoConnector") -public class UserInfo2Dingding extends UserInfoConnector{ - private final static Logger logger = LoggerFactory.getLogger(UserInfo2Dingding.class); - - LdapUtils ldapUtils; - - public UserInfo2Dingding() { - - } - - @Override - public boolean create(UserInfo userInfo) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","inetOrgPerson")); - attributes.put(new BasicAttribute("uid",userInfo.getUsername())); - attributes.put(new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - attributes.put(new BasicAttribute("displayName",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("cn",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("givenName",userInfo.getGivenName())); - attributes.put(new BasicAttribute("sn",userInfo.getFamilyName())); - - attributes.put(new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - attributes.put(new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - attributes.put(new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - attributes.put(new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - attributes.put(new BasicAttribute("manager",managerDn)); - attributes.put(new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - attributes.put(new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - super.create(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=inetOrgPerson)(uid="+userInfo.getUsername()+"))", constraints); - if (results == null || !results.hasMore()) { - return create(loadUser(userInfo)); - } - - ModificationItem[] modificationItems = new ModificationItem[10]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("displayName",userInfo.getDisplayName())); - modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("cn",userInfo.getDisplayName())); - modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("givenName",userInfo.getGivenName())); - modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("sn",userInfo.getFamilyName())); - - modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - modificationItems[5]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - modificationItems[6]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - modificationItems[7]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - modificationItems[8]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("manager",managerDn)); - - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - logger.info("delete"); - try { - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - super.delete(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - public UserInfo loadUser(UserInfo UserInfo) { - return null; - } -} diff --git a/maxkey-connectors/maxkey-connector-dingding/src/main/resources/application.properties b/maxkey-connectors/maxkey-connector-dingding/src/main/resources/application.properties deleted file mode 100644 index 063611c9a..000000000 --- a/maxkey-connectors/maxkey-connector-dingding/src/main/resources/application.properties +++ /dev/null @@ -1,47 +0,0 @@ -#spring.profiles.active=dev -#application -application.title=MaxKey-Connector-LDAP -application.name=MaxKey-Connector-LDAP -application.formatted-version=v2.0.0 GA - -#server port -server.port=9601 - -#datasource -spring.datasource.username=root -spring.datasource.password=maxkey -spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - -spring.kafka.bootstrap-servers=localhost:9092 -###########【初始化消费者配置】########### -# 默认的消费组ID -spring.kafka.consumer.properties.group.id=LdapConsumerGroup -# 是否自动提交offset -spring.kafka.consumer.enable-auto-commit=true -# 提交offset延时(接收到消息后多久提交offset) -spring.kafka.consumer.auto.commit.interval.ms=1000 -# 当kafka中没有初始offset或offset超出范围时将自动重置offset -# earliest:重置为分区中最小的offset; -# latest:重置为分区中最新的offset(消费分区中新产生的数据); -# none:只要有一个分区不存在已提交的offset,就抛出异常; -spring.kafka.consumer.auto-offset-reset=latest -# 消费会话超时时间(超过这个时间consumer没有发送心跳,就会触发rebalance操作) -spring.kafka.consumer.properties.session.timeout.ms=120000 -# 消费请求超时时间 -spring.kafka.consumer.properties.request.timeout.ms=180000 -# Kafka提供的序列化和反序列化类 -spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer -spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer -# 消费端监听的topic不存在时，项目启动会报错(关掉) -spring.kafka.listener.missing-topics-fatal=false -# 设置批量消费 -# spring.kafka.listener.type=batch -# 批量消费每次最多消费多少条消息 -# spring.kafka.consumer.max-poll-records=50 - -config.connector.ldap.providerUrl=ldap:// -config.connector.ldap.principal=maxkey -config.connector.ldap.credentials=maxkey -config.connector.ldap.baseDN=dc=maxkey,dc=top \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-feishu/.classpath b/maxkey-connectors/maxkey-connector-feishu/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-feishu/.project b/maxkey-connectors/maxkey-connector-feishu/.project deleted file mode 100644 index c6c026363..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-feishu - Project maxkey-connector-feishu created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 2fe9998c7..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-feishu/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-feishu/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-feishu/build.gradle b/maxkey-connectors/maxkey-connector-feishu/build.gradle deleted file mode 100644 index 280b117ab..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -description = "maxkey-connector-feishu" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-connectors:maxkey-connector-base") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/FeishuConsumerApplication.java b/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/FeishuConsumerApplication.java deleted file mode 100644 index 3a761748e..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/FeishuConsumerApplication.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.constants.ConstantsProperties; -import org.maxkey.persistence.ldap.LdapUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@PropertySource(ConstantsProperties.applicationPropertySource) -@SpringBootApplication -@ComponentScan(basePackages = { - "org.maxkey.connector", - "org.maxkey.connector.receiver", - "org.maxkey.connector.feishu" - }) -public class FeishuConsumerApplication { - - public static void main(String[] args) { - // TODO Auto-generated method stub - ConfigurableApplicationContext context = SpringApplication.run(FeishuConsumerApplication.class, args); - - } - - //@Bean(name = "ldapUtils") - public LdapUtils getLdapConnection( - @Value("${config.connector.ldap.providerUrl}") String providerUrl, - @Value("${config.connector.ldap.principal}") String principal, - @Value("${config.connector.ldap.credentials}") String credentials, - @Value("${config.connector.ldap.baseDN}") String baseDn - )throws Exception{ - - LdapUtils ldapUtils=new LdapUtils( - providerUrl, - principal, - credentials, - baseDn); - if(ldapUtils.openConnection()==null){ - throw new Exception("connection to Ldap Error."); - } - return ldapUtils; - } - - - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(FeishuConsumerApplication.class); - } - -} diff --git a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Group2Feishu.java b/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Group2Feishu.java deleted file mode 100644 index 10dfadd87..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Group2Feishu.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.feishu; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "groupConnector") -public class Group2Feishu extends GroupConnector { - private final static Logger logger = LoggerFactory.getLogger(Group2Feishu.class); - - LdapUtils ldapUtils; - public Group2Feishu() { - - } - - @Override - public boolean create(Groups group) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","groupOfUniqueNames")); - attributes.put(new BasicAttribute("cn",group.getName())); - attributes.put(new BasicAttribute("uniqueMember","uid=dummy")); - - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+group.getName()+")", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(group); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(","), oldDn.length()); - - String groupName=dnSplit[0].split("=")[1]; - if(group.getName()!=groupName){ - String newDn="cn="+group.getName()+","+rdn; - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("cn",groupName)); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(Groups group) throws Exception { - logger.info("delete"); - try { - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean addMember(GroupMember groupMember) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - Groups group =new Groups(); - group.setName(groupMember.getGroupName()); - create(group); - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.ADD_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean deleteMember(GroupMember groupMember) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - return true; - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - - -} diff --git a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Organization2Feishu.java b/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Organization2Feishu.java deleted file mode 100644 index dd3964dc1..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Organization2Feishu.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.feishu; - -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "organizationConnector") -public class Organization2Feishu extends OrganizationConnector{ - private final static Logger logger = LoggerFactory.getLogger(Organization2Feishu.class); - - LdapUtils ldapUtils; - public Organization2Feishu() { - - } - - @Override - public boolean create(Organizations organization) throws Exception { - logger.info("create"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getParentId()+"))", constraints); - String rdn=""; - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","organizationalUnit")); - attributes.put(new BasicAttribute("ou",organization.getName())); - //attributes.put(new BasicAttribute("name",organization.getName())); - //attributes.put(new BasicAttribute("id",organization.getId())); - //attributes.put(new BasicAttribute("porgname",organization.getpName())); - //attributes.put(new BasicAttribute("porgid",organization.getpId())); - attributes.put(new BasicAttribute("description",organization.getId())); - - String dn="ou="+organization.getName()+","+rdn; - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - - return super.create(organization); - } - - @Override - public boolean update(Organizations organization) throws Exception{ - logger.info("update"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(organization); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(",")+1, oldDn.length()); - - String ouName=dnSplit[0].split("=")[1]; - if(organization.getName()!=ouName){ - String newDn="ou="+organization.getName()+","+rdn; - logger.debug("oldDn : "+oldDn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("ou",ouName)); - //modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("name",organization.getName())); - //modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("id",organization.getId())); - //modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgname",organization.getpName())); - //modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgid",organization.getpId())); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - - return super.update(organization); - } - - @Override - public boolean delete(Organizations organization) throws Exception{ - logger.info("delete"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String dn=""; - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - - return super.delete(organization); - } - -} diff --git a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Password2Feishu.java b/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Password2Feishu.java deleted file mode 100644 index f4e2455fc..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/Password2Feishu.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.feishu; - -import javax.naming.NamingException; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; - -import org.maxkey.connector.PasswordConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - - -@Component(value = "passwordConnector") -public class Password2Feishu extends PasswordConnector{ - private final static Logger logger = LoggerFactory.getLogger(Password2Feishu.class); - - LdapUtils ldapUtils; - - public Password2Feishu() { - - } - - @Override - public boolean sync(UserInfo userInfo) throws Exception{ - logger.info("changePassword"); - try { - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/UserInfo2Feishu.java b/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/UserInfo2Feishu.java deleted file mode 100644 index e4aa3d660..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/src/main/java/org/maxkey/connector/feishu/UserInfo2Feishu.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.feishu; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -@Component(value = "userInfoConnector") -public class UserInfo2Feishu extends UserInfoConnector{ - private final static Logger logger = LoggerFactory.getLogger(UserInfo2Feishu.class); - - LdapUtils ldapUtils; - - public UserInfo2Feishu() { - - } - - @Override - public boolean create(UserInfo userInfo) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","inetOrgPerson")); - attributes.put(new BasicAttribute("uid",userInfo.getUsername())); - attributes.put(new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - attributes.put(new BasicAttribute("displayName",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("cn",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("givenName",userInfo.getGivenName())); - attributes.put(new BasicAttribute("sn",userInfo.getFamilyName())); - - attributes.put(new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - attributes.put(new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - attributes.put(new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - attributes.put(new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - attributes.put(new BasicAttribute("manager",managerDn)); - attributes.put(new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - attributes.put(new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - super.create(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=inetOrgPerson)(uid="+userInfo.getUsername()+"))", constraints); - if (results == null || !results.hasMore()) { - return create(loadUser(userInfo)); - } - - ModificationItem[] modificationItems = new ModificationItem[10]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("displayName",userInfo.getDisplayName())); - modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("cn",userInfo.getDisplayName())); - modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("givenName",userInfo.getGivenName())); - modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("sn",userInfo.getFamilyName())); - - modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - modificationItems[5]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - modificationItems[6]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - modificationItems[7]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - modificationItems[8]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("manager",managerDn)); - - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - logger.info("delete"); - try { - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - super.delete(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - public UserInfo loadUser(UserInfo UserInfo) { - return null; - } -} diff --git a/maxkey-connectors/maxkey-connector-feishu/src/main/resources/application.properties b/maxkey-connectors/maxkey-connector-feishu/src/main/resources/application.properties deleted file mode 100644 index 063611c9a..000000000 --- a/maxkey-connectors/maxkey-connector-feishu/src/main/resources/application.properties +++ /dev/null @@ -1,47 +0,0 @@ -#spring.profiles.active=dev -#application -application.title=MaxKey-Connector-LDAP -application.name=MaxKey-Connector-LDAP -application.formatted-version=v2.0.0 GA - -#server port -server.port=9601 - -#datasource -spring.datasource.username=root -spring.datasource.password=maxkey -spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - -spring.kafka.bootstrap-servers=localhost:9092 -###########【初始化消费者配置】########### -# 默认的消费组ID -spring.kafka.consumer.properties.group.id=LdapConsumerGroup -# 是否自动提交offset -spring.kafka.consumer.enable-auto-commit=true -# 提交offset延时(接收到消息后多久提交offset) -spring.kafka.consumer.auto.commit.interval.ms=1000 -# 当kafka中没有初始offset或offset超出范围时将自动重置offset -# earliest:重置为分区中最小的offset; -# latest:重置为分区中最新的offset(消费分区中新产生的数据); -# none:只要有一个分区不存在已提交的offset,就抛出异常; -spring.kafka.consumer.auto-offset-reset=latest -# 消费会话超时时间(超过这个时间consumer没有发送心跳,就会触发rebalance操作) -spring.kafka.consumer.properties.session.timeout.ms=120000 -# 消费请求超时时间 -spring.kafka.consumer.properties.request.timeout.ms=180000 -# Kafka提供的序列化和反序列化类 -spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer -spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer -# 消费端监听的topic不存在时，项目启动会报错(关掉) -spring.kafka.listener.missing-topics-fatal=false -# 设置批量消费 -# spring.kafka.listener.type=batch -# 批量消费每次最多消费多少条消息 -# spring.kafka.consumer.max-poll-records=50 - -config.connector.ldap.providerUrl=ldap:// -config.connector.ldap.principal=maxkey -config.connector.ldap.credentials=maxkey -config.connector.ldap.baseDN=dc=maxkey,dc=top \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-ldap/.classpath b/maxkey-connectors/maxkey-connector-ldap/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-ldap/.project b/maxkey-connectors/maxkey-connector-ldap/.project deleted file mode 100644 index dadcf381a..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-ldap - Project maxkey-connectors-ldap created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.core.prefs b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8f838df8f..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=warning -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.launching.prefs b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index f8a131b56..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 9169e826c..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-ldap/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-ldap/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-ldap/build.gradle b/maxkey-connectors/maxkey-connector-ldap/build.gradle deleted file mode 100644 index 9952b29b6..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -description = "maxkey-connector-ldap" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-connectors:maxkey-connector-base") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/LdapConsumerApplication.java b/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/LdapConsumerApplication.java deleted file mode 100644 index 8aff5d437..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/LdapConsumerApplication.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.constants.ConstantsProperties; -import org.maxkey.persistence.ldap.LdapUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@PropertySource(ConstantsProperties.applicationPropertySource) -@SpringBootApplication -@ComponentScan(basePackages = { - "org.maxkey.connector", - "org.maxkey.connector.receiver", - "org.maxkey.connector.ldap" - }) -public class LdapConsumerApplication { - - public static void main(String[] args) { - // TODO Auto-generated method stub - ConfigurableApplicationContext context = SpringApplication.run(LdapConsumerApplication.class, args); - - } - - //@Bean(name = "ldapUtils") - public LdapUtils getLdapConnection( - @Value("${config.connector.ldap.providerUrl}") String providerUrl, - @Value("${config.connector.ldap.principal}") String principal, - @Value("${config.connector.ldap.credentials}") String credentials, - @Value("${config.connector.ldap.baseDN}") String baseDn - )throws Exception{ - - LdapUtils ldapUtils=new LdapUtils( - providerUrl, - principal, - credentials, - baseDn); - if(ldapUtils.openConnection()==null){ - throw new Exception("connection to Ldap Error."); - } - return ldapUtils; - } - - - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(LdapConsumerApplication.class); - } - -} diff --git a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Group2Ldap.java b/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Group2Ldap.java deleted file mode 100644 index c3c4663e0..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Group2Ldap.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.ldap; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "groupConnector") -public class Group2Ldap extends GroupConnector { - private final static Logger logger = LoggerFactory.getLogger(Group2Ldap.class); - - LdapUtils ldapUtils; - public Group2Ldap() { - - } - - @Override - public boolean create(Groups group) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","groupOfUniqueNames")); - attributes.put(new BasicAttribute("cn",group.getName())); - attributes.put(new BasicAttribute("uniqueMember","uid=dummy")); - - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+group.getName()+")", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(group); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(","), oldDn.length()); - - String groupName=dnSplit[0].split("=")[1]; - if(group.getName()!=groupName){ - String newDn="cn="+group.getName()+","+rdn; - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("cn",groupName)); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(Groups group) throws Exception { - logger.info("delete"); - try { - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean addMember(GroupMember groupMember) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - Groups group =new Groups(); - group.setName(groupMember.getGroupName()); - create(group); - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.ADD_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean deleteMember(GroupMember groupMember) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - return true; - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - - -} diff --git a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Organization2Ldap.java b/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Organization2Ldap.java deleted file mode 100644 index 549a9d537..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Organization2Ldap.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.ldap; - -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "organizationConnector") -public class Organization2Ldap extends OrganizationConnector{ - private final static Logger logger = LoggerFactory.getLogger(Organization2Ldap.class); - - LdapUtils ldapUtils; - public Organization2Ldap() { - - } - - @Override - public boolean create(Organizations organization) throws Exception { - logger.info("create"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getParentId()+"))", constraints); - String rdn=""; - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","organizationalUnit")); - attributes.put(new BasicAttribute("ou",organization.getName())); - //attributes.put(new BasicAttribute("name",organization.getName())); - //attributes.put(new BasicAttribute("id",organization.getId())); - //attributes.put(new BasicAttribute("porgname",organization.getpName())); - //attributes.put(new BasicAttribute("porgid",organization.getpId())); - attributes.put(new BasicAttribute("description",organization.getId())); - - String dn="ou="+organization.getName()+","+rdn; - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - - return super.create(organization); - } - - @Override - public boolean update(Organizations organization) throws Exception{ - logger.info("update"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(organization); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(",")+1, oldDn.length()); - - String ouName=dnSplit[0].split("=")[1]; - if(organization.getName()!=ouName){ - String newDn="ou="+organization.getName()+","+rdn; - logger.debug("oldDn : "+oldDn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("ou",ouName)); - //modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("name",organization.getName())); - //modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("id",organization.getId())); - //modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgname",organization.getpName())); - //modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgid",organization.getpId())); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - - return super.update(organization); - } - - @Override - public boolean delete(Organizations organization) throws Exception{ - logger.info("delete"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String dn=""; - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - - return super.delete(organization); - } - -} diff --git a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Password2Ldap.java b/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Password2Ldap.java deleted file mode 100644 index 213cb62d6..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/Password2Ldap.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.ldap; - -import javax.naming.NamingException; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; - -import org.maxkey.connector.PasswordConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - - -@Component(value = "passwordConnector") -public class Password2Ldap extends PasswordConnector{ - private final static Logger logger = LoggerFactory.getLogger(Password2Ldap.class); - - LdapUtils ldapUtils; - - public Password2Ldap() { - - } - - @Override - public boolean sync(UserInfo userInfo) throws Exception{ - logger.info("changePassword"); - try { - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/UserInfo2Ldap.java b/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/UserInfo2Ldap.java deleted file mode 100644 index 755d679a2..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/src/main/java/org/maxkey/connector/ldap/UserInfo2Ldap.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.ldap; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -@Component(value = "userInfoConnector") -public class UserInfo2Ldap extends UserInfoConnector{ - private final static Logger logger = LoggerFactory.getLogger(UserInfo2Ldap.class); - - LdapUtils ldapUtils; - - public UserInfo2Ldap() { - - } - - @Override - public boolean create(UserInfo userInfo) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","inetOrgPerson")); - attributes.put(new BasicAttribute("uid",userInfo.getUsername())); - attributes.put(new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - attributes.put(new BasicAttribute("displayName",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("cn",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("givenName",userInfo.getGivenName())); - attributes.put(new BasicAttribute("sn",userInfo.getFamilyName())); - - attributes.put(new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - attributes.put(new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - attributes.put(new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - attributes.put(new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - attributes.put(new BasicAttribute("manager",managerDn)); - attributes.put(new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - attributes.put(new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - super.create(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=inetOrgPerson)(uid="+userInfo.getUsername()+"))", constraints); - if (results == null || !results.hasMore()) { - return create(loadUser(userInfo)); - } - - ModificationItem[] modificationItems = new ModificationItem[10]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("displayName",userInfo.getDisplayName())); - modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("cn",userInfo.getDisplayName())); - modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("givenName",userInfo.getGivenName())); - modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("sn",userInfo.getFamilyName())); - - modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - modificationItems[5]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - modificationItems[6]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - modificationItems[7]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - modificationItems[8]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("manager",managerDn)); - - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - logger.info("delete"); - try { - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - super.delete(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - public UserInfo loadUser(UserInfo UserInfo) { - return null; - } -} diff --git a/maxkey-connectors/maxkey-connector-ldap/src/main/resources/application.properties b/maxkey-connectors/maxkey-connector-ldap/src/main/resources/application.properties deleted file mode 100644 index 063611c9a..000000000 --- a/maxkey-connectors/maxkey-connector-ldap/src/main/resources/application.properties +++ /dev/null @@ -1,47 +0,0 @@ -#spring.profiles.active=dev -#application -application.title=MaxKey-Connector-LDAP -application.name=MaxKey-Connector-LDAP -application.formatted-version=v2.0.0 GA - -#server port -server.port=9601 - -#datasource -spring.datasource.username=root -spring.datasource.password=maxkey -spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - -spring.kafka.bootstrap-servers=localhost:9092 -###########【初始化消费者配置】########### -# 默认的消费组ID -spring.kafka.consumer.properties.group.id=LdapConsumerGroup -# 是否自动提交offset -spring.kafka.consumer.enable-auto-commit=true -# 提交offset延时(接收到消息后多久提交offset) -spring.kafka.consumer.auto.commit.interval.ms=1000 -# 当kafka中没有初始offset或offset超出范围时将自动重置offset -# earliest:重置为分区中最小的offset; -# latest:重置为分区中最新的offset(消费分区中新产生的数据); -# none:只要有一个分区不存在已提交的offset,就抛出异常; -spring.kafka.consumer.auto-offset-reset=latest -# 消费会话超时时间(超过这个时间consumer没有发送心跳,就会触发rebalance操作) -spring.kafka.consumer.properties.session.timeout.ms=120000 -# 消费请求超时时间 -spring.kafka.consumer.properties.request.timeout.ms=180000 -# Kafka提供的序列化和反序列化类 -spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer -spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer -# 消费端监听的topic不存在时，项目启动会报错(关掉) -spring.kafka.listener.missing-topics-fatal=false -# 设置批量消费 -# spring.kafka.listener.type=batch -# 批量消费每次最多消费多少条消息 -# spring.kafka.consumer.max-poll-records=50 - -config.connector.ldap.providerUrl=ldap:// -config.connector.ldap.principal=maxkey -config.connector.ldap.credentials=maxkey -config.connector.ldap.baseDN=dc=maxkey,dc=top \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-welink/.classpath b/maxkey-connectors/maxkey-connector-welink/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-welink/.project b/maxkey-connectors/maxkey-connector-welink/.project deleted file mode 100644 index e9d44fba1..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-welink - Project maxkey-connector-welink created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.component deleted file mode 100644 index b1c083a0c..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-welink/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-welink/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-welink/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-welink/build.gradle b/maxkey-connectors/maxkey-connector-welink/build.gradle deleted file mode 100644 index 01a914bbf..000000000 --- a/maxkey-connectors/maxkey-connector-welink/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -description = "maxkey-connector-welink" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-connectors:maxkey-connector-base") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/WelinkConsumerApplication.java b/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/WelinkConsumerApplication.java deleted file mode 100644 index 271aa69d1..000000000 --- a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/WelinkConsumerApplication.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.constants.ConstantsProperties; -import org.maxkey.persistence.ldap.LdapUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@PropertySource(ConstantsProperties.applicationPropertySource) -@SpringBootApplication -@ComponentScan(basePackages = { - "org.maxkey.connector", - "org.maxkey.connector.receiver", - "org.maxkey.connector.welink" - }) -public class WelinkConsumerApplication { - - public static void main(String[] args) { - // TODO Auto-generated method stub - ConfigurableApplicationContext context = SpringApplication.run(WelinkConsumerApplication.class, args); - - } - - //@Bean(name = "ldapUtils") - public LdapUtils getLdapConnection( - @Value("${config.connector.ldap.providerUrl}") String providerUrl, - @Value("${config.connector.ldap.principal}") String principal, - @Value("${config.connector.ldap.credentials}") String credentials, - @Value("${config.connector.ldap.baseDN}") String baseDn - )throws Exception{ - - LdapUtils ldapUtils=new LdapUtils( - providerUrl, - principal, - credentials, - baseDn); - if(ldapUtils.openConnection()==null){ - throw new Exception("connection to Ldap Error."); - } - return ldapUtils; - } - - - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(WelinkConsumerApplication.class); - } - -} diff --git a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Group2Welink.java b/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Group2Welink.java deleted file mode 100644 index e4ea5c4d3..000000000 --- a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Group2Welink.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.welink; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "groupConnector") -public class Group2Welink extends GroupConnector { - private final static Logger logger = LoggerFactory.getLogger(Group2Welink.class); - - LdapUtils ldapUtils; - public Group2Welink() { - - } - - @Override - public boolean create(Groups group) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","groupOfUniqueNames")); - attributes.put(new BasicAttribute("cn",group.getName())); - attributes.put(new BasicAttribute("uniqueMember","uid=dummy")); - - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+group.getName()+")", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(group); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(","), oldDn.length()); - - String groupName=dnSplit[0].split("=")[1]; - if(group.getName()!=groupName){ - String newDn="cn="+group.getName()+","+rdn; - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("cn",groupName)); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(Groups group) throws Exception { - logger.info("delete"); - try { - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean addMember(GroupMember groupMember) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - Groups group =new Groups(); - group.setName(groupMember.getGroupName()); - create(group); - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.ADD_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean deleteMember(GroupMember groupMember) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - return true; - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - - -} diff --git a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Organization2Welink.java b/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Organization2Welink.java deleted file mode 100644 index 0e2faa2e5..000000000 --- a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Organization2Welink.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.welink; - -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "organizationConnector") -public class Organization2Welink extends OrganizationConnector{ - private final static Logger logger = LoggerFactory.getLogger(Organization2Welink.class); - - LdapUtils ldapUtils; - public Organization2Welink() { - - } - - @Override - public boolean create(Organizations organization) throws Exception { - logger.info("create"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getParentId()+"))", constraints); - String rdn=""; - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","organizationalUnit")); - attributes.put(new BasicAttribute("ou",organization.getName())); - //attributes.put(new BasicAttribute("name",organization.getName())); - //attributes.put(new BasicAttribute("id",organization.getId())); - //attributes.put(new BasicAttribute("porgname",organization.getpName())); - //attributes.put(new BasicAttribute("porgid",organization.getpId())); - attributes.put(new BasicAttribute("description",organization.getId())); - - String dn="ou="+organization.getName()+","+rdn; - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - - return super.create(organization); - } - - @Override - public boolean update(Organizations organization) throws Exception{ - logger.info("update"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(organization); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(",")+1, oldDn.length()); - - String ouName=dnSplit[0].split("=")[1]; - if(organization.getName()!=ouName){ - String newDn="ou="+organization.getName()+","+rdn; - logger.debug("oldDn : "+oldDn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("ou",ouName)); - //modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("name",organization.getName())); - //modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("id",organization.getId())); - //modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgname",organization.getpName())); - //modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgid",organization.getpId())); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - - return super.update(organization); - } - - @Override - public boolean delete(Organizations organization) throws Exception{ - logger.info("delete"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String dn=""; - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - - return super.delete(organization); - } - -} diff --git a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Password2Welink.java b/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Password2Welink.java deleted file mode 100644 index 56921ba4d..000000000 --- a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/Password2Welink.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.welink; - -import javax.naming.NamingException; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; - -import org.maxkey.connector.PasswordConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - - -@Component(value = "passwordConnector") -public class Password2Welink extends PasswordConnector{ - private final static Logger logger = LoggerFactory.getLogger(Password2Welink.class); - - LdapUtils ldapUtils; - - public Password2Welink() { - - } - - @Override - public boolean sync(UserInfo userInfo) throws Exception{ - logger.info("changePassword"); - try { - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/UserInfo2Welink.java b/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/UserInfo2Welink.java deleted file mode 100644 index fd7c45e18..000000000 --- a/maxkey-connectors/maxkey-connector-welink/src/main/java/org/maxkey/connector/welink/UserInfo2Welink.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.welink; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -@Component(value = "userInfoConnector") -public class UserInfo2Welink extends UserInfoConnector{ - private final static Logger logger = LoggerFactory.getLogger(UserInfo2Welink.class); - - LdapUtils ldapUtils; - - public UserInfo2Welink() { - - } - - @Override - public boolean create(UserInfo userInfo) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","inetOrgPerson")); - attributes.put(new BasicAttribute("uid",userInfo.getUsername())); - attributes.put(new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - attributes.put(new BasicAttribute("displayName",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("cn",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("givenName",userInfo.getGivenName())); - attributes.put(new BasicAttribute("sn",userInfo.getFamilyName())); - - attributes.put(new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - attributes.put(new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - attributes.put(new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - attributes.put(new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - attributes.put(new BasicAttribute("manager",managerDn)); - attributes.put(new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - attributes.put(new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - super.create(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=inetOrgPerson)(uid="+userInfo.getUsername()+"))", constraints); - if (results == null || !results.hasMore()) { - return create(loadUser(userInfo)); - } - - ModificationItem[] modificationItems = new ModificationItem[10]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("displayName",userInfo.getDisplayName())); - modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("cn",userInfo.getDisplayName())); - modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("givenName",userInfo.getGivenName())); - modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("sn",userInfo.getFamilyName())); - - modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - modificationItems[5]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - modificationItems[6]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - modificationItems[7]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - modificationItems[8]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("manager",managerDn)); - - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - logger.info("delete"); - try { - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - super.delete(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - public UserInfo loadUser(UserInfo UserInfo) { - return null; - } -} diff --git a/maxkey-connectors/maxkey-connector-welink/src/main/resources/application.properties b/maxkey-connectors/maxkey-connector-welink/src/main/resources/application.properties deleted file mode 100644 index 063611c9a..000000000 --- a/maxkey-connectors/maxkey-connector-welink/src/main/resources/application.properties +++ /dev/null @@ -1,47 +0,0 @@ -#spring.profiles.active=dev -#application -application.title=MaxKey-Connector-LDAP -application.name=MaxKey-Connector-LDAP -application.formatted-version=v2.0.0 GA - -#server port -server.port=9601 - -#datasource -spring.datasource.username=root -spring.datasource.password=maxkey -spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - -spring.kafka.bootstrap-servers=localhost:9092 -###########【初始化消费者配置】########### -# 默认的消费组ID -spring.kafka.consumer.properties.group.id=LdapConsumerGroup -# 是否自动提交offset -spring.kafka.consumer.enable-auto-commit=true -# 提交offset延时(接收到消息后多久提交offset) -spring.kafka.consumer.auto.commit.interval.ms=1000 -# 当kafka中没有初始offset或offset超出范围时将自动重置offset -# earliest:重置为分区中最小的offset; -# latest:重置为分区中最新的offset(消费分区中新产生的数据); -# none:只要有一个分区不存在已提交的offset,就抛出异常; -spring.kafka.consumer.auto-offset-reset=latest -# 消费会话超时时间(超过这个时间consumer没有发送心跳,就会触发rebalance操作) -spring.kafka.consumer.properties.session.timeout.ms=120000 -# 消费请求超时时间 -spring.kafka.consumer.properties.request.timeout.ms=180000 -# Kafka提供的序列化和反序列化类 -spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer -spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer -# 消费端监听的topic不存在时，项目启动会报错(关掉) -spring.kafka.listener.missing-topics-fatal=false -# 设置批量消费 -# spring.kafka.listener.type=batch -# 批量消费每次最多消费多少条消息 -# spring.kafka.consumer.max-poll-records=50 - -config.connector.ldap.providerUrl=ldap:// -config.connector.ldap.principal=maxkey -config.connector.ldap.credentials=maxkey -config.connector.ldap.baseDN=dc=maxkey,dc=top \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-workweixin/.classpath b/maxkey-connectors/maxkey-connector-workweixin/.classpath deleted file mode 100644 index eca1d9e92..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maxkey-connectors/maxkey-connector-workweixin/.project b/maxkey-connectors/maxkey-connector-workweixin/.project deleted file mode 100644 index ca57ab9ba..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.project +++ /dev/null @@ -1,41 +0,0 @@ - - - maxkey-connector-workweixin - Project maxkey-connector-workweixin created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.buildship.core.prefs b/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 62e3e7e80..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=../.. -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.core.resources.prefs b/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53a..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.component b/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 5a0ce0b47..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - diff --git a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 509bad92c..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.springframework.ide.eclipse.prefs b/maxkey-connectors/maxkey-connector-workweixin/.settings/org.springframework.ide.eclipse.prefs deleted file mode 100644 index a12794d68..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/.settings/org.springframework.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -boot.validation.initialized=true -eclipse.preferences.version=1 diff --git a/maxkey-connectors/maxkey-connector-workweixin/build.gradle b/maxkey-connectors/maxkey-connector-workweixin/build.gradle deleted file mode 100644 index d2579edf5..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -description = "maxkey-connector-workweixin" - -apply plugin: 'java' -apply plugin: 'eclipse-wtp' - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") - compile project(":maxkey-connectors:maxkey-connector-base") - compile project(":maxkey-identitys:maxkey-identity-kafka") - -} \ No newline at end of file diff --git a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/WeixinConsumerApplication.java b/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/WeixinConsumerApplication.java deleted file mode 100644 index 021e045bf..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/WeixinConsumerApplication.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector; - -import org.maxkey.constants.ConstantsProperties; -import org.maxkey.persistence.ldap.LdapUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@PropertySource(ConstantsProperties.applicationPropertySource) -@SpringBootApplication -@ComponentScan(basePackages = { - "org.maxkey.connector", - "org.maxkey.connector.receiver", - "org.maxkey.connector.workweixin" - }) -public class WeixinConsumerApplication { - - public static void main(String[] args) { - // TODO Auto-generated method stub - ConfigurableApplicationContext context = SpringApplication.run(WeixinConsumerApplication.class, args); - - } - - //@Bean(name = "ldapUtils") - public LdapUtils getLdapConnection( - @Value("${config.connector.ldap.providerUrl}") String providerUrl, - @Value("${config.connector.ldap.principal}") String principal, - @Value("${config.connector.ldap.credentials}") String credentials, - @Value("${config.connector.ldap.baseDN}") String baseDn - )throws Exception{ - - LdapUtils ldapUtils=new LdapUtils( - providerUrl, - principal, - credentials, - baseDn); - if(ldapUtils.openConnection()==null){ - throw new Exception("connection to Ldap Error."); - } - return ldapUtils; - } - - - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(WeixinConsumerApplication.class); - } - -} diff --git a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Group2Weixin.java b/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Group2Weixin.java deleted file mode 100644 index 9a50cc99d..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Group2Weixin.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.workweixin; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.GroupConnector; -import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "groupConnector") -public class Group2Weixin extends GroupConnector { - private final static Logger logger = LoggerFactory.getLogger(Group2Weixin.class); - - LdapUtils ldapUtils; - public Group2Weixin() { - - } - - @Override - public boolean create(Groups group) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","groupOfUniqueNames")); - attributes.put(new BasicAttribute("cn",group.getName())); - attributes.put(new BasicAttribute("uniqueMember","uid=dummy")); - - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(Groups group) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+group.getName()+")", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(group); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(","), oldDn.length()); - - String groupName=dnSplit[0].split("=")[1]; - if(group.getName()!=groupName){ - String newDn="cn="+group.getName()+","+rdn; - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("cn",groupName)); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean delete(Groups group) throws Exception { - logger.info("delete"); - try { - String dn="cn="+group.getName()+",dc=groups,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean addMember(GroupMember groupMember) throws Exception { - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - Groups group =new Groups(); - group.setName(groupMember.getGroupName()); - create(group); - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.ADD_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean deleteMember(GroupMember groupMember) throws Exception{ - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(cn="+groupMember.getGroupName()+")", constraints); - if (results == null || !results.hasMore()) { - return true; - } - - String uniqueMember="uid="+groupMember.getMemberName()+",dc=users,"+ldapUtils.getBaseDN(); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("uniqueMember",uniqueMember)); - - String dn="cn="+groupMember.getGroupName()+",dc=groups,"+ldapUtils.getBaseDN(); - logger.debug("dn : "+dn); - logger.debug("uniqueMember : "+uniqueMember); - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - - -} diff --git a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Organization2Weixin.java b/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Organization2Weixin.java deleted file mode 100644 index 4e29e8d58..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Organization2Weixin.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.workweixin; - -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.OrganizationConnector; -import org.maxkey.domain.Organizations; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -@Component(value = "organizationConnector") -public class Organization2Weixin extends OrganizationConnector{ - private final static Logger logger = LoggerFactory.getLogger(Organization2Weixin.class); - - LdapUtils ldapUtils; - public Organization2Weixin() { - - } - - @Override - public boolean create(Organizations organization) throws Exception { - logger.info("create"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getParentId()+"))", constraints); - String rdn=""; - if (results == null || !results.hasMore()) { - rdn=ldapUtils.getBaseDN(); - }else{ - SearchResult sr = (SearchResult) results.next(); - rdn =sr.getNameInNamespace(); - } - - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","organizationalUnit")); - attributes.put(new BasicAttribute("ou",organization.getName())); - //attributes.put(new BasicAttribute("name",organization.getName())); - //attributes.put(new BasicAttribute("id",organization.getId())); - //attributes.put(new BasicAttribute("porgname",organization.getpName())); - //attributes.put(new BasicAttribute("porgid",organization.getpId())); - attributes.put(new BasicAttribute("description",organization.getId())); - - String dn="ou="+organization.getName()+","+rdn; - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - - return super.create(organization); - } - - @Override - public boolean update(Organizations organization) throws Exception{ - logger.info("update"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String oldDn=""; - String rdn=""; - if (results == null || !results.hasMore()) { - return create(organization); - }else{ - SearchResult sr = (SearchResult) results.next(); - oldDn =sr.getNameInNamespace(); - String[] dnSplit=oldDn.split(","); - rdn=oldDn.substring(oldDn.indexOf(",")+1, oldDn.length()); - - String ouName=dnSplit[0].split("=")[1]; - if(organization.getName()!=ouName){ - String newDn="ou="+organization.getName()+","+rdn; - logger.debug("oldDn : "+oldDn); - logger.debug("newDn : "+newDn); - ldapUtils.getCtx().rename(oldDn, newDn); - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REMOVE_ATTRIBUTE,new BasicAttribute("ou",ouName)); - //modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("name",organization.getName())); - //modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("id",organization.getId())); - //modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgname",organization.getpName())); - //modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("porgid",organization.getpId())); - ldapUtils.getCtx().modifyAttributes(newDn, modificationItems); - } - } - - ldapUtils.close(); - - return super.update(organization); - } - - @Override - public boolean delete(Organizations organization) throws Exception{ - logger.info("delete"); - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=organizationalUnit)(description="+organization.getId()+"))", constraints); - String dn=""; - if (results == null || !results.hasMore()) { - - }else{ - SearchResult sr = (SearchResult) results.next(); - dn =sr.getNameInNamespace(); - ldapUtils.getCtx().destroySubcontext(dn); - } - - ldapUtils.close(); - - return super.delete(organization); - } - -} diff --git a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Password2Weixin.java b/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Password2Weixin.java deleted file mode 100644 index da633b329..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/Password2Weixin.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.workweixin; - -import javax.naming.NamingException; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; - -import org.maxkey.connector.PasswordConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - - -@Component(value = "passwordConnector") -public class Password2Weixin extends PasswordConnector{ - private final static Logger logger = LoggerFactory.getLogger(Password2Weixin.class); - - LdapUtils ldapUtils; - - public Password2Weixin() { - - } - - @Override - public boolean sync(UserInfo userInfo) throws Exception{ - logger.info("changePassword"); - try { - ModificationItem[] modificationItems = new ModificationItem[1]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - -} diff --git a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/UserInfo2Weixin.java b/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/UserInfo2Weixin.java deleted file mode 100644 index a83c2e891..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/src/main/java/org/maxkey/connector/workweixin/UserInfo2Weixin.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.connector.workweixin; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import org.maxkey.connector.UserInfoConnector; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.persistence.ldap.LdapUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -@Component(value = "userInfoConnector") -public class UserInfo2Weixin extends UserInfoConnector{ - private final static Logger logger = LoggerFactory.getLogger(UserInfo2Weixin.class); - - LdapUtils ldapUtils; - - public UserInfo2Weixin() { - - } - - @Override - public boolean create(UserInfo userInfo) throws Exception{ - logger.info("create"); - try { - Attributes attributes = new BasicAttributes(); - attributes.put(new BasicAttribute("objectClass","inetOrgPerson")); - attributes.put(new BasicAttribute("uid",userInfo.getUsername())); - attributes.put(new BasicAttribute("userPassword",ReciprocalUtils.decoder(userInfo.getDecipherable()))); - attributes.put(new BasicAttribute("displayName",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("cn",userInfo.getDisplayName())); - attributes.put(new BasicAttribute("givenName",userInfo.getGivenName())); - attributes.put(new BasicAttribute("sn",userInfo.getFamilyName())); - - attributes.put(new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - attributes.put(new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - attributes.put(new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - attributes.put(new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - attributes.put(new BasicAttribute("manager",managerDn)); - attributes.put(new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - attributes.put(new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().createSubcontext(dn, attributes); - ldapUtils.close(); - super.create(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - @Override - public boolean update(UserInfo userInfo) throws Exception{ - logger.info("update"); - try { - SearchControls constraints = new SearchControls(); - constraints.setSearchScope(ldapUtils.getSearchScope()); - NamingEnumeration results = ldapUtils.getConnection() - .search(ldapUtils.getBaseDN(), "(&(objectClass=inetOrgPerson)(uid="+userInfo.getUsername()+"))", constraints); - if (results == null || !results.hasMore()) { - return create(loadUser(userInfo)); - } - - ModificationItem[] modificationItems = new ModificationItem[10]; - modificationItems[0]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("displayName",userInfo.getDisplayName())); - modificationItems[1]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("cn",userInfo.getDisplayName())); - modificationItems[2]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("givenName",userInfo.getGivenName())); - modificationItems[3]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("sn",userInfo.getFamilyName())); - - modificationItems[4]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mobile",userInfo.getWorkPhoneNumber()==null?"":userInfo.getWorkPhoneNumber())); - modificationItems[5]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("mail",userInfo.getWorkEmail()==null?"":userInfo.getWorkEmail())); - - modificationItems[6]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("employeeNumber",userInfo.getEmployeeNumber()==null?"":userInfo.getEmployeeNumber())); - modificationItems[7]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("ou",userInfo.getDepartment()==null?"":userInfo.getDepartment())); - modificationItems[8]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("departmentNumber",userInfo.getDepartmentId()==null?"":userInfo.getDepartmentId())); - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("title",userInfo.getJobTitle()==null?"":userInfo.getJobTitle())); - - String managerDn="uid=dummy"; - if(userInfo.getManagerId()==null||userInfo.getManagerId().equals("")){ - - }else{ - UserInfo queryManager=new UserInfo(); - queryManager.setId(userInfo.getManagerId()); - UserInfo manager=loadUser(queryManager); - managerDn="uid="+manager.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - } - modificationItems[9]=new ModificationItem(DirContext.REPLACE_ATTRIBUTE,new BasicAttribute("manager",managerDn)); - - - - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - - ldapUtils.getCtx().modifyAttributes(dn, modificationItems); - ldapUtils.close(); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - - } - - @Override - public boolean delete(UserInfo userInfo) throws Exception{ - logger.info("delete"); - try { - String dn="uid="+userInfo.getUsername()+",dc=users,"+ldapUtils.getBaseDN(); - ldapUtils.getCtx().destroySubcontext(dn); - ldapUtils.close(); - super.delete(userInfo); - } catch (NamingException e) { - e.printStackTrace(); - } - return true; - } - - public UserInfo loadUser(UserInfo UserInfo) { - return null; - } -} diff --git a/maxkey-connectors/maxkey-connector-workweixin/src/main/resources/application.properties b/maxkey-connectors/maxkey-connector-workweixin/src/main/resources/application.properties deleted file mode 100644 index 063611c9a..000000000 --- a/maxkey-connectors/maxkey-connector-workweixin/src/main/resources/application.properties +++ /dev/null @@ -1,47 +0,0 @@ -#spring.profiles.active=dev -#application -application.title=MaxKey-Connector-LDAP -application.name=MaxKey-Connector-LDAP -application.formatted-version=v2.0.0 GA - -#server port -server.port=9601 - -#datasource -spring.datasource.username=root -spring.datasource.password=maxkey -spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - -spring.kafka.bootstrap-servers=localhost:9092 -###########【初始化消费者配置】########### -# 默认的消费组ID -spring.kafka.consumer.properties.group.id=LdapConsumerGroup -# 是否自动提交offset -spring.kafka.consumer.enable-auto-commit=true -# 提交offset延时(接收到消息后多久提交offset) -spring.kafka.consumer.auto.commit.interval.ms=1000 -# 当kafka中没有初始offset或offset超出范围时将自动重置offset -# earliest:重置为分区中最小的offset; -# latest:重置为分区中最新的offset(消费分区中新产生的数据); -# none:只要有一个分区不存在已提交的offset,就抛出异常; -spring.kafka.consumer.auto-offset-reset=latest -# 消费会话超时时间(超过这个时间consumer没有发送心跳,就会触发rebalance操作) -spring.kafka.consumer.properties.session.timeout.ms=120000 -# 消费请求超时时间 -spring.kafka.consumer.properties.request.timeout.ms=180000 -# Kafka提供的序列化和反序列化类 -spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer -spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer -# 消费端监听的topic不存在时，项目启动会报错(关掉) -spring.kafka.listener.missing-topics-fatal=false -# 设置批量消费 -# spring.kafka.listener.type=batch -# 批量消费每次最多消费多少条消息 -# spring.kafka.consumer.max-poll-records=50 - -config.connector.ldap.providerUrl=ldap:// -config.connector.ldap.principal=maxkey -config.connector.ldap.credentials=maxkey -config.connector.ldap.baseDN=dc=maxkey,dc=top \ No newline at end of file diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/HttpEncoder.java b/maxkey-core/src/main/java/org/maxkey/util/HttpEncoder.java similarity index 82% rename from maxkey-client-sdk/src/main/java/org/maxkey/client/utils/HttpEncoder.java rename to maxkey-core/src/main/java/org/maxkey/util/HttpEncoder.java index 31bc34fde..d72ae7dfe 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/HttpEncoder.java +++ b/maxkey-core/src/main/java/org/maxkey/util/HttpEncoder.java @@ -15,15 +15,13 @@ */ -package org.maxkey.client.utils; +package org.maxkey.util; import java.io.*; import java.net.*; import java.util.*; import java.util.regex.*; -import org.maxkey.client.oauth.exceptions.*; - public abstract class HttpEncoder { private static final String CHARSET = "UTF-8"; @@ -37,13 +35,12 @@ public abstract class HttpEncoder { ENCODING_RULES = Collections.unmodifiableMap(rules); } - public static String encode(String plain) { - Preconditions.checkNotNull(plain, "Cannot encode null object"); + public static String encode(String plain) throws Exception { String encoded; try { encoded = URLEncoder.encode(plain, CHARSET); } catch (UnsupportedEncodingException uee) { - throw new OAuthException("Charset not found while encoding string: " + CHARSET, uee); + throw new Exception("Charset not found while encoding string: " + CHARSET, uee); } for (Map.Entry rule : ENCODING_RULES.entrySet()) { encoded = applyRule(encoded, rule.getKey(), rule.getValue()); @@ -56,8 +53,6 @@ public abstract class HttpEncoder { } public static String decode(String encoded) throws UnsupportedEncodingException { - Preconditions.checkNotNull(encoded, "Cannot decode null object"); - return URLDecoder.decode(encoded, CHARSET); } diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/HttpsTrusts.java b/maxkey-core/src/main/java/org/maxkey/util/HttpsTrusts.java similarity index 98% rename from maxkey-client-sdk/src/main/java/org/maxkey/client/utils/HttpsTrusts.java rename to maxkey-core/src/main/java/org/maxkey/util/HttpsTrusts.java index 5065112c8..c6601baf4 100644 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/utils/HttpsTrusts.java +++ b/maxkey-core/src/main/java/org/maxkey/util/HttpsTrusts.java @@ -15,7 +15,7 @@ */ -package org.maxkey.client.utils; +package org.maxkey.util; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; diff --git a/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component b/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component index ece70642c..8d35ad2cc 100644 --- a/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component +++ b/maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component @@ -9,8 +9,5 @@ uses - - uses - diff --git a/maxkey-identitys/maxkey-identity-rest/build.gradle b/maxkey-identitys/maxkey-identity-rest/build.gradle index f3b5076a7..af68ea8de 100644 --- a/maxkey-identitys/maxkey-identity-rest/build.gradle +++ b/maxkey-identitys/maxkey-identity-rest/build.gradle @@ -10,6 +10,5 @@ dependencies { compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") } \ No newline at end of file diff --git a/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component b/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component index ee55793d0..12fb4919b 100644 --- a/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component +++ b/maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component @@ -9,8 +9,5 @@ uses - - uses - diff --git a/maxkey-identitys/maxkey-identity-scim/build.gradle b/maxkey-identitys/maxkey-identity-scim/build.gradle index da59b114b..04f2e2063 100644 --- a/maxkey-identitys/maxkey-identity-scim/build.gradle +++ b/maxkey-identitys/maxkey-identity-scim/build.gradle @@ -10,6 +10,5 @@ dependencies { compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") } \ No newline at end of file diff --git a/maxkey-lib/maxkey-client-sdk-2.0.0.RELEASE.jar b/maxkey-lib/maxkey-client-sdk-2.0.0.RELEASE.jar new file mode 100644 index 0000000000000000000000000000000000000000..38aff510057bbe72359964799f5cb56d7ff2ccd0 GIT binary patch literal 99193 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໚?JN^#Mj_x;-0`Pjg}?)5z2uiFBe zjqB@Zz&zPnjkiQM+gy!+ZrSuy8S&mK?{C)7K^Y`vr#oQm|7gdS-}N$&e!w=1sS&0c-`b(l;Tci_TWoLQCXY#HENU8}_3OXxZP2-GH7%HPkSqVu|m63)^5z#F@ znznKy%t%>6l*Wau6>|A=W?Ds&?WNgioiVmkh_Wj%OEQ=$I+w6eysX=E0iuh;&5o?u z4EJ8?hq0~n4#pjAmV_t2XDr2hcxo{}F_kAGHeX07h)7DRq#M2d*r-w4QoP1?BS2DL zBVEkI#aj4cTtX#b`T?14W?TbmtplHt1hisoiO-i#hk@yVBRt3?Vcs-11di@?V1ar zput*{Ok@^{eMFTlHz(7t$}r`c@Hz=BQh1F$QG2+T_*`qwRar9SAyqbax7cA)mqpUX zTsz8w_H|Fg@hi5tQA~v!2YpPF4<3^{L_FKZNs>2}&)Q`2qT_yn868Du^ckgFJH!$I zXo?x59URM8iy&z6i9p5emIo2QjkOo-qHd}%gq6qS1Zi$6-B5+0bcYd=SsFIimqA3I zpuj*aZ@lydaeL(6REbFT!$6}YdNAeAc1{R1(V#(xo4;^-v1Cq~5G6*$;8VO1`W5ev zzC_04Q@vmo4lL$VzkvEtHg^j$Ot(p4+*3ntY#WL)&Bn)EZT9MK`R(nAKkIJl6>sbS zZMB~7qk;B`1&z~|NcRJ)Eq+ikKHjp74U_gvZ0NP8(v54yRdePO?BV19}+DRN5w=slv{pYjOz}kh8+wF%4$J%GxChTiDV=|j^jo({uo3F%feorpg z9U!+sb4E|WW&A>;bTyW`hrZHAlfomK`_~^(5t}2Ef&)9+TQXJM+}WgoF^5E+YB9|u z5DDPirUFd9vlW#fE9+rl4Y!`4cq{fEUUb{SAfNcO8oVubfKx7JlxfMk;MO5Hn0E;E z6uHEK6Cw!cYfnpNeu4n5S`je#ONDDf71hO2zHG(=)f`&&YXYzPTGLJ*@Ujl|ub6wQ zhg}E7X|&I^N?I<9+?CrHdeBh>b?^2WHJG&(1!m~8&S8w>(_b(}d2s7J;0{D-d z(1?T92u2Q??Z;kCl~`d$#Vt+ zOU=Y|6Kh13S*WO4c7yW?rTpOgW6?*}=*M-alBzR^m&KG6IK?vtb#j_v>^q|9D0bq3 zaw#-Y83e_BVbg4f9BV_1qHEN}ZMRU4jx1+~caFs#9hJ@@B(Eq%?4##bVN*P|^(d1& zm<5o%z45{qH|r^!&7dS@wYn&_G+v=R*%DCUEOB>D_xr15S8XJ2$M=sS)$Mv;b zX@hTY=1m%#?u8x0OS_GtvnQ~m?`{YN0x@c_ML@_8E=m2lLFncfPayr-#VuUEa>P)B zcSX$hRhQw|@eF1~55T^0oOSPWt2A~R<0zfj>Na{{>~)b2b6wtNQNvv>Yx-sk4SzymXTGMhgFpaDo`3ls*$9sY2~RoqqOWCJ@zYIoi;hS-n0dkJIGub z?%K-|?@q7$6ijji-+?hdH0(~ki;Hze4ec1#=H8>GWBj1$*i1f})xHht8O&`{=)7u` zaxbH9PXW#rd__fH^aIB&*28V4@WVCV7&g!y+MCCFf!*PYl?E~$u1@(3al{wo{bJL# z{>RVSlL57XnF%fcYl*h_X|Cx5hkI2W{zi@b+V%Dr7-WO+ctQUHxD2BWWlwV$yUTIe z$r0ZaL#Cnv=Jd9P9@eIw z^v3_?FH7%kYV^ODw*R>5-zzWvT4m_!Vqy2c)?z98#!dhRCUlhlTO!K;tQ7=&gQ=a1 zrLo~(sE?SX4ZvsTZ_rPPx~C6{I_{TTZRQqk934of0AVvol7I$8b6N;B4G`j_%hE0${$34e&%ZosVpd)i0#>{kpzReL!r|?Qvb%jen_}8L z_WBhYoF>ED_HB*a@?+Y(88M%!Ji;+{D95@$Jlo)}`yDZ_AAg`+-zVWb?ti=lWNgtN z1Vdr@yddz=jERTz##6myz=yuH!{`5mG`vrSVtc)z^wHAbsxWB6z*ndjje)1KP`SaR z=Zl`9>fwNR%2xm7eDA!UgN)~lTc7o$# zcimF-%tiRVHSQ`eZn*}QHb!nWvc#r?K`J8~-^|OXgfW%D9%q&mB^-1J$?T**-*dr! z<2Esjga(V0$RkL**0}hk8F7DbI(9n!{D@hvkpT&EpE$}xhA><>#iDEKx7G5#oL>|D zxQEJ!F%zD9S3yiPQ!mv4q*&*kfkr&^Au>~5$}MYF)U5dgkI12@EaKptUuglOv3Cp~ zIlJ`0w9Y_|PY#R?lch)&YxYO@qnehZuYZLJ@(mQ-b8dsq)E`IbjSV}pntHk1A-aSr zymTmEs;vHI%6tVI5}F(h7!@B}`3j4nXvoqi`&~=ax}mLFFVsDbGIQ3{g%$Tps)i7}h#-QiO#g`B!cE*sGslkUxOntTw3 zt<~&p!S!jr*NoBQ-G$ru&vDeRTkaC6NZYIu*i$$SXlK`Ao%A0$HPNy4R{QB_kja+a zeD5Buqui@o_nw7iU#n#|V+*|^(W8$T*Op7j>wcXwzr}95JTubu8>aRk| ztK=;s_OP$9Q+*pO#SFl#dCbMt_Ug1sGp#M;&9#kfmaSi4c;~pB+*DmY+CLb_Bb0T?<3#1YJ676cg2#~Sf-@yXkFtss$@_ME^=gNT zq3ycu#n$^H1VcGL{4MOu1I1C|@h-vWJNI{<6snQs%zJooJd9rU)D!w7S*=wzTD#&9 z4sOvVBbtD_KTt+|U*ao516&k0QB_d>mF9-PLVsEl@4qh+282~Vulac7aNkdzIZAsS z_KahCe(h-pVd~9GXuqNzQaIAoVuiT;GTcZrLyD#+RMiD*F32q!@)jZQprHB4_FqYU zx%{;cO;Jv(?(Dql#)!_VXruRMiILQFMW3N*YF)E{2A zNraR1A>WE;fr>#FBvueJ9zlxnN`~Cv8uCXeRFG~rBHVZrx5cW9hF%Fsul6<=2i*7r zxg}TWklLkBM@%mq0(hgwQ!EA1^`PKAR}8t;ds1>G<8p5lgW>51>9lwvoi0jc;c4@P z;9pJFc>}p$WDyA^!o??99=Hg*f*6QkQZvq02Xj+)F&_%>MHgRCU@lBGq;Dyn=1!1c z5}XmCKBM1v6A_aQe??5J(g&-{e-^GXB{9K$`x?O7JTs95%H z=#InhvhZ}DF7AY;mnUChd!zKIQ=@&_VG02SfGcIz*<{LeKo!4%GNKkz9lAwm3h$FW6QCt;iwM*?s*^T+1TM1T&qO7| ztaH+e3{p4W=h@K&;`!7xZ#X8D;W`?+%?dgyu5(P;zUTjEuFvBfF7^Wed@cu!NdMld z^MA%8WdNdNWBQkKguJWEKTSuf?|`^=j2>hmHWKUp<`nf36wm=@PZe#vR)Qb{%8HO> zBh^h3VGSKONB7`|naX&p2ON3-CjkG-95^sc;QTf{Gk1*}fIR2gn|*$s0J7RQN94Y* zFaYFAgE~lvKGl1AIM2x$qd``DmO@a`k}SImBx&_IyEjc7>&XCvn73z79QY)SL1EZ) zNRu0hL3AuO5GFLJy`L>P0)fwy z!VC4XWfmsD@dQD}&S}P=&ln86FCqk;r)b3j_gP0{kMn+VUfE{TX@tt#&G{L5B_pHB za|SDSpkzX*@5gh`cO8jsv}YhA@l56!B?c>ujpj=<+HMF@G3cAW+I}{`V-@v|LNX*s^7YNZV=ALRt}T zDz`xtUGKfJ6e^Y6q=j;;x9hgMmMcnb+wJ|GnK?6a&YUxI-kv_={L}OO{+{3Sd-mt~ z{VsReZTT{&wU^!9v$W-!Z*y$0mwon%q55|=%~P9`SZ}HnRfBk*G(BfHxN6qZg2)S2 zF>mG{ykvPxbEoO@CWXq+9cyp8UcLV@Zu2IuyjM&`9Z9?2Y{Fr+5= zY%;6F*lqXg#jpL&%+EC~dr|+PswvG&Rc-&vx@crvrrw|L$2;Y@C+#`w-Pd=B5!~um z;D6oIKqseNvps40+rb~(nhbRITit)2nf^x6yJ=;jM;6Duyf`JRzw6cex}62;8RySW z49Wa{d28nEu{ABdBfaO>SZAiibK4V=XR594tk@aNb^g(*u6+La-kh|~&{Khne%)oN z=4`raro!_j$ET_#>L}g0n9;0%yrH{c;iih^(ON5i(7PAA@4j=~<3#(8j4#@jKN@cD zVzT=4hqU>4J;~Hhc$g5|w&=((g&v-dk^ku8Ki{rMpH{r%<@oILUM8a)2l70AJD_xP zSaVm!n=vYlUu(zNFI(^DbCa8se>Qg5#H{0$#x_ZxI`iCm6r&2OFDI6b3@W+$Q)F3f z#;uKiY*?7eGFWIeki-7r7gpQUyOkkGS>`iu+vpFfaYa?n2aQ_xvZ3bS+lAf{(J?_k zX@$qPTkO`->soZaG$xkuB%)u1VR5(4&m_TkS$OY>jW^BTH`kpTk+mo7qII2fpu;bz zr!P65)z8?Qo@;mK@~kG-+VLNiSZsqyV{|4M=|9}+amDZI!?Z&QsXLx~F1G4pzUvLp zsduPIS&(})UFB)%nEw97i%JwnVM>HHvQ#GdCUHZ;&-kL_A zJnevYLrYGaop0t9_hRxp4`h$YJJs#C9>lTtT2C(tVix}tX;W9Y{?`i4%jZHr4!u>F zVfOpJV+|ivkV}h_t8OpKR3DfYqEM)weo%Yhpu-D7I+nxTWeT)OzU4z@=xk3 zt=x=e9p|5`$7#Aqo?%U?YIl3i)cW-T_?}UPGc4GdW<*4Xn1|1biH(i{XQg3mPM)W) z69i(}r1e={q1B>wkKv7z>MjF2a}H-9x|2$)J3Ha%0Wpfn%J* zoTv@SA1#rHMv+^JkKdt=wW+fUZjT5vDCwoZ;Pa&>KV zTRPl$w581-hW^~K4&5gdFBBD*>s;3_+qGT$x3Mwxr~L;uV~H9w@H5eIs`D!St2fp8ciC_f?xOpUg3c)Qe~vun0Yu{rwch zzx7>CmKt$So6H>W@;VT{Ki^bg$2|3;BR1$gGdA=!4oUaz9ium`+t0`R{lK*rv%|A~ z?pf#jz+Ur%!bqDdP3lR-HLpTjRO_k+Jb{sULG<;jPwv&IeyZ_y#Z^DOnmT$dk z`SS6D#L@RvjJWwPr>{SDGv&;`ce%{u?pUESzA-Z;_mQ985Z@4H%hvtl%1?9^ts2_A zeZlGQ@Zq!joIce&&U&YIxa7y|qzP9(nH6z;hiNC2AYN%J6j}8Sr}p2>zcJ_YcSl}V zcP0k*EKv`h?!U1uJAO)5r~UP;L9bIg8`ttw-CHeBtwFt{&LP#if3Ud}2jGf-T~B|hA46Q&W2 zZq$_xgJtJwHIwOL57FT8*_12150%1y_zFK*;ENIuK~GXe*;rOCOnW;I&si*cNrbLS zJTY7g5hj#a73>+^pOBSf7?uI7zT3(~m_xXuAuFRME~7U-qi`!kR(@?<{(YqR17j0o zxY1JbpB`6bo&--nwt?`|L@*2n54kQ2M&R>Z;`o^;-ZZ_@WmDnudnQaLQ0-%hhwOn~ zL3*c0D4um9m(7s@`?l-;tKt4hjF;%vO32<*@^ZD7N7$3 z8a|_0K}F8z|h22jiP;~fff)GCWYARYM565sHkP5*CepSLo9u$ONq&cB3i|S zk=HDHO_RSRNE-qbgN9hg5)U!+r3Y=x4i1Qm-~xl02|34>ExLvMV38g$K|)vMSb`yX zH9Za%|4>B+h33Bc;Ul034$ztwVfgUnA;a1K4+R!pR|XX`x=jIl>Fo#9qbR+l^TRHmM3zc^J+_iHE%0 zMho2wybm&?f}_cWZ)z*vpajCRKrP;2U9vnn8x6T0L~%W4CKP2 zwgYnWlfLjP82t|9QA4v60@*SA=LAw6LbYPNa{y=~8Bnc6fT(3Q(*qPlXpN4FVh5rO zb{G}8{5Qwx_pJpw)SoB5AsmK5Q+j49m;*@2&!>|^q6yJTJAmW_v^GavnLG;VlZfW- z999^I0~^qCSamc$xfB7bI(n?F1&8WkA-4dgLFAwQG_pMB*vtsgcC3IJQX@=Ur466?`5D%7k$o^kwu{prw zeDr}n9VM!qS(=S1@iqML`v|oaw8#YOXE_Qy(%O^M0}9lE=^(zUsw=;Rg<5$NSEiPl zfbtH)_>Ow{#S#zsS1m0jx{8Z>YS@(qMLGpGF%M&bFVxZ%T13m1(WxJYKQH7$56b9* z9~uV%OFV>IPm4yl9;d@KJjLT{JLqn#GO_K(-Jr#VCowajuBJEsy1j=$d*z@#d^J@x zeghRX5vnh&gPVXUk3a1_b(fkb62d}8NcC;A9S0w&0HM`j#etugK9!4wjc>tWA>^$- zYEtdl;`{XxEqtLNkxOqE zr!nI#Aak^cn=pE9^3eHKLk_DxaI_>H2E$CKLe%RpmUxJFyF6Ifg9{4|quSmlO!88OW zi#1B5AckiYQ|KzwppYG`kw`|294IF18%l#rb{s(>88M!gn2f1TgG^3zEg~B+43U^^ zt0oOLnL&w&T*MG4Vy>9cG`K`lewl5M7-K|C!quWdLX3$(-i;6=d5B3kW4?g|?G+{C zdJq*yjO-w$yEpb5>B!540%L;)94`qI+S9b?kP&f3?(~Tw6W!@!SUhCJ1ldUZ(ej(N z$It4MA;$?$yCsgL(L-gTYiO~2FJz#gM_)2~KB8k&G3+KIYT+atMN%Cr5&ch!fsJR- z1C}7cyipP>jp%kzOp-H;774jk5q++SVFyg9VbOJp3^O3Qz!HO2n^S}09bys7PxRg+ z##}y^8dG$Ug1q!ZcNSvM>_sv_rJY+4r6s;f7X#0*rUsUJqfUe+zF!r?uCkX2EB%_4 z2#rEv-3v^SgbD3l#<-F}qZb=xVc@$c7fKAlyAvW3@!bg~4-eTZ2Z{O>3Xy|&c~i_$ zxRR>G0%<9)a!OK=UF;H5yzxd9O}s56&i&AjOh938in*^M+#ParQi5dygAok> O%ne`>xfmaxkey-protocol-authorize maxkey-jose-jwt maxkey-core - maxkey-client-sdk maxkey-protocol-oauth-2.0 maxkey-protocol-saml-2.0 maxkey-identity-scim diff --git a/maxkey-web-manage/build.gradle b/maxkey-web-manage/build.gradle index b3bcd0adf..2c4995fc8 100644 --- a/maxkey-web-manage/build.gradle +++ b/maxkey-web-manage/build.gradle @@ -19,7 +19,6 @@ buildscript { dependencies { compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0") compile project(":maxkey-protocols:maxkey-protocol-saml-2.0") compile project(":maxkey-identitys:maxkey-identity-scim") diff --git a/maxkey-web-maxkey/.project b/maxkey-web-maxkey/.project index 57b762ddf..59895fa49 100644 --- a/maxkey-web-maxkey/.project +++ b/maxkey-web-maxkey/.project @@ -8,7 +8,6 @@ maxkey-protocol-oauth-2.0 maxkey-protocol-saml-2.0 maxkey-core - maxkey-client-sdk maxkey-authentications maxkey-protocol-authorize maxkey-protocol-cas diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle index 504a6b0ff..c07b84378 100644 --- a/maxkey-web-maxkey/build.gradle +++ b/maxkey-web-maxkey/build.gradle @@ -18,7 +18,6 @@ buildscript { dependencies { compile project(":maxkey-core") compile project(":maxkey-persistence") - compile project(":maxkey-client-sdk") compile project(":maxkey-authentications") diff --git a/settings.gradle b/settings.gradle index abe455627..8e205441e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,6 @@ rootProject.name = 'MaxKey' //Common -include 'maxkey-client-sdk' include 'maxkey-core' include 'maxkey-persistence' include 'maxkey-authentications' @@ -14,22 +13,6 @@ include 'maxkey-identitys:maxkey-identity-scim' include 'maxkey-identitys:maxkey-identity-kafka' include 'maxkey-identitys:maxkey-identity-rest' - -//connectors -include 'maxkey-connectors:maxkey-connector-base' -//MS Active Directory -include 'maxkey-connectors:maxkey-connector-activedirectory' -//OpenLDAP -include 'maxkey-connectors:maxkey-connector-ldap' -//企业微信 -include 'maxkey-connectors:maxkey-connector-workweixin' -//阿里钉钉 -include 'maxkey-connectors:maxkey-connector-dingding' -//字节跳动飞书 -include 'maxkey-connectors:maxkey-connector-feishu' -//华为WeLink -include 'maxkey-connectors:maxkey-connector-welink' - //Protocol //include 'maxkey-protocols' include 'maxkey-protocols:maxkey-protocol-oauth-2.0'